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