Merged the openwebwork/develop branch up to June 30.