Merge branch 'master' of mop.mine.nu:brisk-img