Pull request for issue #1195

Fixes #1195. Generated by conveyor-workflow.