Merge branch 'master' into reorder_libs