Temp commit for a stash
Merge branch 'master' of github.com:studentkittens/moosecat
Pseudo-fixes for plugin_sys