Fix bad merge.
Fix bad merge.

It was a mistake to make new features within default branch and make fixes in
other.

kxepal/simpleubjson,498888197/simpleubjson,brainwater/simpleubjson,samipshah/simpleubjson