Remove circular dependency to angular-oboe
Merge origin/master