Merge branch 'master' of /mnt/sandisk8/Git-Repositories/shish into cmake
...
Merge branch 'cmake' of https://github.com/rsenn/shish into cmake