Udates, mainly from discussion on the Cuis mail list
Merge remote-tracking branch 'upstream/master'