Pull request for issue #400

Fixes #400. Generated by conveyor-workflow.