Pull request for issue #288

Fixes #288. Generated by conveyor-workflow.