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