#660 SaveRestoreInsertCaret
Merge branch 't660' into 660_aaron_textAngular