Revert "Merge commit 'tomv_w/master'"
drwxr-xr-x - Dak