Merge master into nickdos fork