Sync'd branch integration/fx-team with upstream @ Thu Sep 25 06:37:38 PDT 2014