Merge branch 'master' of D:\htdocs\wimble with conflicts.
Merge branch 'master' of https://github.com/leamarty/wimble
Publics