Merge master back into unstable and change version on unstable