Merge branch 'master' into magic-number