Merge branch 'master' into post-bold2