Branch for developing Bitten client/server testing
Merge in some changes from trunk