Merge pull request #23 from mjmeans/master

DATA-1501

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