Pull request for issue #292

Fixes #292. Generated by conveyor-workflow.