Pull request for issue #534

Fixes #534. Generated by conveyor-workflow.