Bit of a messy commit. Re-generated code, plus some tweaks to client API. I need to change branch and don't want to stash :-S
Authored by: James Williams 2014-09-11
Parent(s): [48f817]
Child(ren): [3d7fce]