Pull request for issue #496

Fixes #496. Generated by conveyor-workflow.