Merge master into dev

I was developing in master accidentally and will develop in dev from now on.