20150521 sports.tennis: Wawrinka battles into Geneva last-eight