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