Synchronize with 1.7; fix entity saving (#7)