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