Sync'd branch integration/fx-team with upstream @ Tue Nov  4 14:03:49 PST 2014