preparing for emberjs 1.5.1 upgrade