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