Merge master into bootstrap3

Merges most recent angular-ui master into bootstrap3 branch.