Merge branch 'bug-transparent' of git://git.rogdham.net/cavote