Merge from master when preparing beta for development.