Pull request for issue #915

Fixes #915. Generated by conveyor-workflow.