Merge branch 'trace' into master, update patchlev.h