Pull request for issue #294

Fixes #294. Generated by conveyor-workflow.