Merging master into unstable20

This somehow fell out of my brain's queue yesterday. :P