Cleanup, now testing making merges more easy.
Modified branch daily for cleanup.
Merge branch 'daily'