Sync'd branch integration/fx-team with upstream @ Thu Nov  6 12:27:38 PST 2014