Pull from upstream

If I get this wrong again, shame on me...

 Pull recent updates from Tux2/master to Jabulba/master