Pull request for issue #591

Fixes #591. Generated by conveyor-workflow.