merge Wasteland 2.8a update

merge Wasteland 2.8a update into branch SBRF-dev