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