Merge DEV changes into master

It is about time, hundreds of servers are using this version already, and there have been no complaints. Go!