Merge remote-tracking branch 'origin/master' into cyberleiber
Merge branch 'cyberleiber' of das-labor.org:users/chris/borgware-2d into cyberleiber