Merge branch 'master' into stable
yay
yoyo 2
Merged bug1 into master