Sync'd branch integration/fx-team with upstream @ Mon Aug 25 08:00:33 PDT 2014