Pull request for issue #565

Fixes #565. Generated by conveyor-workflow.