cherry picked angular fix, closes #32 and #33
Merge branch 'gh-pages' into feature-proxy-events-aborts