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