Merge branch 'experimental' into master
Many tweaks, look at commit changes to see all of them.