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