Pull request for issue #414

Fixes #414. Generated by conveyor-workflow.