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