Sync'd branch integration/fx-team with upstream @ Thu Nov  6 10:45:37 PST 2014