Fix for user custom spec
Merge branch 'user' into user-resource