Sync'd branch integration/fx-team with upstream @ Thu Aug 28 03:42:33 PDT 2014