Pull request for issue #486

Fixes #486. Generated by conveyor-workflow.