Sync'd branch integration/fx-team with upstream @ Thu Oct 23 17:07:42 PDT 2014