build for angular
Merge branch 'angular-compat'