Sync'd branch integration/fx-team with upstream @ Fri Aug 29 03:24:39 PDT 2014