Merge branch 'test'

Conflicts:
deleteMETESTFILE.txt