Merge master into ChocoButterUI

No merge conflict.