Test case for #1654
Fix #1654
Updated CHANGELOG
Regenerated build/
Merge remote-tracking branch 'upstream/1.2.5' into 1.2.5
Merge pull request #1659 from sjinks/1.2.5

[1.2.5] Fix #1654