Merge latest changes for ticket455 from aloha editor.