Sync'd branch integration/fx-team with upstream @ Thu Sep 11 05:51:38 PDT 2014