Pull request for issue #532

Fixes #532. Generated by conveyor-workflow.