Sync'd branch integration/fx-team with upstream @ Tue Nov  4 20:42:41 PST 2014