Master into Pamela_Branch_2: First Time

To merge most recent master into Pamela_Branch_2 before inserting additions and then merging back into master.

requested review from @pamela.dyer_uconn.edu

assigned to @pamela.dyer_uconn.edu

closed