Fixes #1653
Fix BC handling of old require-dev, refs #1656
Merge pull request #1655 from miklosm/iss1653

Fix for #1653