Yesterday
Merge from protobuf_fixes (fixes NotSupportedException when recording demos)