Sync'd branch integration/fx-team with upstream @ Thu Oct  9 12:04:44 PDT 2014