Sync'd branch integration/fx-team with upstream @ Wed Nov  5 08:32:54 PST 2014