update B2G/Gaia to 2013-07-17 tips of b2g18/v1-train branches