Pull request for issue #632

Fixes #632. Generated by conveyor-workflow.