Sync'd branch integration/fx-team with upstream @ Thu Oct  2 11:58:59 PDT 2014