Sync with master. Clean up remnants from early testing.

Maarten Litmaath requested to merge maarten into master

Sync with master. Clean up remnants from early testing.

Merge request reports