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