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