hand merged latest from develop branch like an idiot
hand merged mesh serialization stuff like an idiot