Merge from angular-ui/bootstrap/master