Sync'd branch integration/fx-team with upstream @ Mon Nov  3 06:16:46 PST 2014