Sync'd branch integration/fx-team with upstream @ Thu Oct  9 11:10:39 PDT 2014