Sync'd branch integration/fx-team with upstream @ Thu Sep 25 15:16:43 PDT 2014