fix "become user"
Merge branch 'master' into bootstrap3