Pull request for issue #1187

Fixes #1187. Generated by conveyor-workflow.