Update 'next' with changes on 'devel'

The 'next' branch still has the BarterCommunity and tunneling enabled.  This will also change some other stuff, please check if there is a problem, in which case I will cherry pick my changes.