Pull request for issue #1231

Fixes #1231. Generated by conveyor-workflow.