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