Merge pull request #254 from pstaabp/develop

pstaabp/Develop
Merge branch 'develop' of https://github.com/openwebwork/webwork2 into develop