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