Merge pull request #1641 from fonttools/fix-singlepos-merge

Fix singlepos merge