Merge commit '91166d4d804ca40e669274ea9b9a982b923e193b'
Merge branch 'master' of https://github.com/Manichee/pcgen