Fix for too many changelings.
Merge pull request #2471 from CIB/master

Fix for too many changelings