Pull request for issue #518

Fixes #518. Generated by conveyor-workflow.