Sync'd branch integration/fx-team with upstream @ Mon Nov  3 17:25:42 PST 2014