Fixes for Juno, based on master. The code base has changed a bunch so it wasn't even possible to show a "conflicts" easily. It is a straight port.
Fixes for Juno, based on master. The code base has changed a bunch so it wasn't even possible to show a "conflicts" easily. It is a straight port.