Pull request for issue #690

Fixes #690. Generated by conveyor-workflow.