Merge branch 'master' into bitops