Pull request for issue #595

Fixes #595. Generated by conveyor-workflow.