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