Consistency: rename Pickler to SPickler
Consistency: rename PickleBuilder to PBuilder
Merge branch 'master' into artifact-delivery