Sync'd branch integration/fx-team with upstream @ Thu Oct  2 06:49:38 PDT 2014