Pull request for issue #508

Fixes #508. Generated by conveyor-workflow.