Sync'd branch integration/fx-team with upstream @ Thu Oct 30 18:19:43 PDT 2014