Test case for #1480

(cherry picked from commit 9be0cfba825d0f9c4e5800faeccb88898500da85)
Fix #1480

(cherry picked from commit 02fde4ffc4d8a002a98154dad57d8abfd53f50f2)
Makefile to regenerate parsers
Regenerated parsers
Updated changelog
Regenerated build/
Merge pull request #1622 from sjinks/1.2.5

[1.2.5] Fix #1480