Backport r4270 and r4302

Backport changes to fix issue 992 and issue 1004
4 files changed
tree: 8a981db19c5a496498f03685a0ac05467f1a37ab
  1. src/
  2. LICENSE