Sync'd branch integration/fx-team with upstream @ Mon Aug 25 04:57:46 PDT 2014