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