Sync'd branch integration/fx-team with upstream @ Mon Aug 25 08:27:25 PDT 2014