Pull request for issue #563

Fixes #563. Generated by conveyor-workflow.