Sync'd branch integration/fx-team with upstream @ Thu Sep 11 12:07:40 PDT 2014