Update version name and merge 'master' back into unstable