more fixes
Merge origin/master
Merge origin/master