Merge branch 'master' of github.com:louis813/devise-xb