Sync'd branch integration/fx-team with upstream @ Thu Nov  6 04:06:43 PST 2014