Pull request for issue #554

Fixes #554. Generated by conveyor-workflow.