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