Merge branch 'master' of t61p:/home/dpavlin/klin/Printer-EVOLIS/