Merge branch 'trunk' into correct_deps