@tourettes - are you happy to merge these changes now? Then we can move forward with the other fixes that have been tested.
We need to update the build documentation in WIKI + fix the bot at least. Other than that we should be good to go in my opinion.
Do you need any help with any aspects of this, or is it just a matter of you having enough free time?
Cheers,
Mark