Sync'd branch integration/fx-team with upstream @ Wed Nov  5 12:16:45 PST 2014