Sync'd branch integration/fx-team with upstream @ Thu Nov  6 02:02:49 PST 2014