Merge branch 'devise'