Merge d0rc/master into hobofan/master