Merged the openwebwork/develop branch up to July 12