Pull request for issue #593

Fixes #593. Generated by conveyor-workflow.