Pull request for issue #286

Fixes #286. Generated by conveyor-workflow.