Sync'd branch integration/fx-team with upstream @ Mon Aug 25 15:17:05 PDT 2014