Sync'd branch integration/fx-team with upstream @ Thu Nov  6 17:54:51 PST 2014