Merge branch '1.8.0' of git.omp.am:/home/omp/git/conky into 1.8.0