Pull request for issue #567

Fixes #567. Generated by conveyor-workflow.