Sync'd branch integration/fx-team with upstream @ Wed Nov  5 15:19:43 PST 2014