daan b0e38d5697 merge from dev-win

2019-08-25 13:12:57 -07:00

..

vs2017

merge dev-win

2019-08-20 17:31:46 -07:00

vs2019

…