Pull request for issue #561

Fixes #561. Generated by conveyor-workflow.