Sync'd branch integration/fx-team with upstream @ Thu Nov  6 04:13:53 PST 2014