Pull request for issue #392

Fixes #392. Generated by conveyor-workflow.