Pull request for issue #1239

Fixes #1239. Generated by conveyor-workflow.