nightly/master/2018-11-13T2332
267290f9 · Merge branch 'scottHvscaleFixResolved' into 'master' ·