Pull request for issue #390

Fixes #390. Generated by conveyor-workflow.