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