Merge branch 'master' of github.com:DarthMike/indielib-crossplatform