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