commit before merge angular1.2 branch