Sync'd branch integration/fx-team with upstream @ Mon Nov  3 10:09:44 PST 2014