Merge pull request #1709 from KhronosGroup/fix-pp

PP: Fix #1605: Paste tokens for ## through number->letter transitions.