Pull request for issue #284

Fixes #284. Generated by conveyor-workflow.