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