Sync'd branch integration/fx-team with upstream @ Wed Nov  5 03:24:40 PST 2014