Pull request for issue #538

Fixes #538. Generated by conveyor-workflow.