Merge branch 'master' of git://island.quantumachine.net/dragonfly