Sync'd branch integration/fx-team with upstream @ Thu Sep 18 00:10:41 PDT 2014