Sync'd branch integration/fx-team with upstream @ Fri Nov  7 13:03:43 PST 2014