Sync'd branch integration/fx-team with upstream @ Fri Aug 29 06:42:33 PDT 2014