Merging in xremix Google fix