Sync'd branch integration/fx-team with upstream @ Mon Nov  3 22:02:43 PST 2014