Merge develop into master#267

Merged

blakerosenthal merged 4 commits intomasterfrom

Jul 10, 2019

Commits on Jun 2, 2019

Integers here can overflow can overflow the buffer_size calculation on line 159 without warning.
Clint Daniels
committed

Commits on Jul 9, 2019