Pull request for issue #440

Fixes #440. Generated by conveyor-workflow.