Bump app version and merge master into 3.11