Merge branch 'update692' of github.com:octo-technology/gitlabhq into update692
Merge branch 'update692' of github.com:octo-technology/gitlabhq into update692