Pull request for issue #520

Fixes #520. Generated by conveyor-workflow.