Syncronize VisualEditor: d36f22e..bd3b5ff

Change-Id: Idc2ae418bebb8ed99173867f5e9a6ba2f55adf24