Sync'd branch integration/fx-team with upstream @ Fri Nov  7 02:58:42 PST 2014