Merge branch 'trunk' into fix_1491