Merge branch 'master' of https://github.com/DamnWidget/mamba
Merge branch 'master' of https://github.com/DamnWidget/mamba
fixed JSON tests when ujson is installed, resoves #90
Merge remote-tracking branch 'upstream/master'