Merge branch 'ionic-updates'