Merge branch 'master' into bs3