Merge branch 'diego' of https://github.com/nppangband/NPPAngband_QT.git
Merge branch 'Jeff'