changes to support devise 3.2.x