Master into Pamela_Branch_2: Second Time

Pamela Dyerrequested to merge
master into Pamela_Branch_2

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

Merge request reports