require issues...
Merge branch 'devise' into wiki