Merge branch 'master' of /home/elanthis/Source/janssonxx