Pull request for issue #490

Fixes #490. Generated by conveyor-workflow.