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