Pull request for issue #599

Fixes #599. Generated by conveyor-workflow.