Sync'd branch integration/fx-team with upstream @ Thu Oct  9 08:48:36 PDT 2014