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