Pull request for issue #522

Fixes #522. Generated by conveyor-workflow.