bringing up to date with angular-branch