Commit a3e110d605c469a59b692465f5bc0e5ce5214779

Ran Benita 2018-08-05T08:45:19

Merge pull request #67 from fooishbar/fix-more-fuzz Fix more fuzz-testing fallout