Pull request for issue #536

Fixes #536. Generated by conveyor-workflow.