Pull request for issue #1229

Fixes #1229. Generated by conveyor-workflow.