Merged in kill-oscar-prpl (pull request #609)

2019-10-25, Gary Kramlich