Sync'd branch integration/fx-team with upstream @ Tue Nov  4 17:24:51 PST 2014