Merged master into writable-nested-modelserializer.