Pull request for issue #1367

Fixes #1367. Generated by conveyor-workflow.