Synchronize with 1.6; fix entity saving (#7)