Sync'd branch integration/fx-team with upstream @ Tue Nov  4 07:32:38 PST 2014