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