Merging Santhosh's additions for contenteditable with master

This commit resolves several simple merge conflicts.

There are still 3 tests that fail when running them automatically, but work when typing manually, so we assume that the failure is in the testing infrastructure code. No tests fail in the regular textarea.