Sync'd branch integration/fx-team with upstream @ Wed Nov  5 04:35:18 PST 2014