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