Pull request for issue #510

Fixes #510. Generated by conveyor-workflow.