Merge development to master

It's time.