Merge branch 'mob' of git+ssh://aavelar@repo.or.cz/srv/git/siplcs into mob