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