Pull request for issue #1225

Fixes #1225. Generated by conveyor-workflow.