Sync'd branch integration/fx-team with upstream @ Thu Oct  2 10:31:42 PDT 2014