merge master into quda-gmresdr