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