Uncommented tests -- oops.
Merge branch 'master' into fetch-newest