Merge branch 'master' into missing-return