Fix derpy Filler Pattern selection

Closes #1394
Merge branch 'nightly' into marmot