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