sync with upstreaom #2

Open
goatzone wants to merge 545 commits from liza/Questionable:master into master
Showing only changes of commit 5bc0d4d80e - Show all commits