Merge branch 'master' into fmt-overflow