Waffle test.
merge branch 'develop' into mk_jsonrpc