Fixes for the connectionless admin panel.
Merge branch 'master' of git://github.com/alanedwardes/carbo