Master into Pamela_Branch_2: Second Time

Second Try, this time without checking the box about squashing commits

requested review from @pamela.dyer_uconn.edu

assigned to @pamela.dyer_uconn.edu

closed