Add 'user'
Merge branch 'master' of ../stage