Merge git+ssh://repo.or.cz/srv/git/inexio into mob