Update room.save() to eliminate extra data.
Merge remote-tracking branch 'origin/master'