Merge remote-tracking branch 'dev/master'

CHANGELOG-EE.md

 Please view this file on the master branch, on stable branches it's out of date.
 
+## 9.3.1 (2017-06-26)
+
+- Geo: fix removal of repositories from disk on secondary nodes. !2210
+- Fix Geo middleware to work properly with multiple requests.
+
 ## 9.3.0 (2017-06-22)
 
 - Per user/group access levels for Protected Tags. !1629

changelogs/unreleased/33461-display-user-id.yml

----
-title: Display own user id in account settings page
-merge_request: 12141
-author: Riccardo Padovani