Merge git://github.com/xtne6f/EDCB into merge