Merged Master into Flammy: patch-4 via Github GUI

Merged Master into Flammy: patch-4 via Github GUI