Pull request for issue #504

Fixes #504. Generated by conveyor-workflow.