Pull request for issue #933

Fixes #933. Generated by conveyor-workflow.