Pull request for issue #674

Fixes #674. Generated by conveyor-workflow.