Bring Enlighten fork up-to-date

Get latest from jim/carmen