Update WikiLove to master

Change-Id: If13c1fad7e39801fff45428705c61c38122cd0b0