Sync'd branch integration/fx-team with upstream @ Mon Aug 25 16:59:42 PDT 2014