Sync'd branch integration/fx-team with upstream @ Thu Nov  6 15:03:55 PST 2014