bring metagriffin:master up to date with miracle2k:master