Pull request for issue #1281

Fixes #1281. Generated by conveyor-workflow.