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