Merge branch 'code-2132' of https://github.com/skylarhiebert/pcgen

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@20882 ef53c05b-3124-4d59-ae7d-fe3273f42be7

https://github.com/pcgen/pcgen/commit/dd7be1d