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