Merge branch 'develop' into means
Made unpickling backwards-compatible.