Sync'd branch integration/fx-team with upstream @ Thu Oct 30 08:47:44 PDT 2014