Pull request for issue #514

Fixes #514. Generated by conveyor-workflow.