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