Fix https://github.com/nens/lizard-nxt/issues/383
Merge branch 'integration' of github.com:nens/lizard-client into integration