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