Pull request for issue #540

Fixes #540. Generated by conveyor-workflow.