Pull request for issue #1287

Fixes #1287. Generated by conveyor-workflow.