Pull from upstream

Hoping this works.... Pull recent updates from Tux2/master to Jabulba/master