tree fe8350d94748314c347930ed65c543bb614cc3a6
parent d344cbcb8a2371d006f74ceb727e71b032aaf568
author Mark Struberg <struberg@apache.org> 1525462398 +0200
committer Mark Struberg <struberg@apache.org> 1525462398 +0200

backporting changes from master to the JSON_P-1.0 branch

fixes: #21
txs to jgallimore for the patch!
Applied with slight changes.

This includes the following tickets, and likely a few more:
JOHNZON-156
JOHNZON-142
JOHNZON-135
JOHNZON-133
JOHNZON-123

For more history please analyse the master branch for the original changes.