Merging master back to unstable

(Did it backwards—unstable then master—so I had to merge back to unstable again.  Alas.)