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