Merge branch 'devel' of ssh://repo.or.cz/srv/git/mimi_vx_overlay into devel