Pull request for issue #416

Fixes #416. Generated by conveyor-workflow.