Merge pull request #138 from mjmeans/DATA2127

DATA-2127

git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk@25367 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Merge pull request #139 from mjmeans/DATA-2128

Data 2128

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