DO NOT MERGE - devise

indentation should be 2 spaces