MISC update
Merge branch 'staging' of git://github.com/ventoviro/windwalker into staging
Bug fixes