Fix for new iOS 8 properties of NSObject getting serialized
Merge remote-tracking branch 'origin/master'