Merge dev into master to change branch usage

From now on master will contain the development for the next minor release.