Merge remote-tracking branch 'origin/master' into jries/169
Authored by: John L. Ries 2018-12-08
Parents: [536555][64e501]
Child: [f05300]