fixes SchemeAsMultiScheme bug, when deserialize returns null
Merge branch 'master' into 0.8.2