Pull request for issue #492

Fixes #492. Generated by conveyor-workflow.