Sync'd branch integration/fx-team with upstream @ Thu Sep 25 05:49:36 PDT 2014