jwiegley Merge remote-tracking branch 'origin/master' into pending

Latest commit 7d549d6

Aug 24, 2018