Sync'd branch integration/fx-team with upstream @ Thu Oct  9 21:42:41 PDT 2014