Pull request for issue #1255

Fixes #1255. Generated by conveyor-workflow.