custom event update
Merge branch 'ionic-pristine'
fix up tests