Pull request for issue #1279

Fixes #1279. Generated by conveyor-workflow.