Merge commit 'andytim/freedos'