Syncronize VisualEditor: af9cf9b..bfa15be

Change-Id: I131691044b4df022485af9c4a0fae2b3e7d781cf