Pull request for issue #1271

Fixes #1271. Generated by conveyor-workflow.