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