A-Fitz Merge branch 'master' of https://atlas.ion.uwplatt.edu/bitbucket/scm/…