Sync'd branch integration/fx-team with upstream @ Fri Nov  7 08:41:45 PST 2014