Pull request for issue #542

Fixes #542. Generated by conveyor-workflow.