Merge commit 'e450e55d6395a3052f93946da42757a7f6df2ad1' * commit 'e450e55d6395a3052f93946da42757a7f6df2ad1': change default for dither to true