Sync'd branch integration/fx-team with upstream @ Thu Oct  2 03:54:45 PDT 2014