Merge from master into production for new release of the app. App is ready to be released out of beta.