pholser Merge branch '0.8-branch'

Latest commit e00fb49

Jun 4, 2018