Pull request for issue #623

Fixes #623. Generated by conveyor-workflow.