Sync'd branch integration/fx-team with upstream @ Thu Sep 11 11:22:41 PDT 2014