Pull request for issue #530

Fixes #530. Generated by conveyor-workflow.