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