One last merge from angular-refactor...