Pull request for issue #512

Fixes #512. Generated by conveyor-workflow.