Sync'd branch integration/fx-team with upstream @ Wed Oct  1 03:42:45 PDT 2014