Merge branch 'develop' of https://github.com/andrews-web-libraries/awl into develop