Merge prerelease into master