Sync'd branch integration/fx-team with upstream @ Thu Aug 28 07:19:37 PDT 2014