Pull request for issue #296

Fixes #296. Generated by conveyor-workflow.