Merge branch 'master' of github.com:kampfgnu/Firefly