recommit to fix devise issues
merge-head