Pull request for issue #525

Fixes #525. Generated by conveyor-workflow.