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