Code

Merge branch 'jc/maint-1.6.1-allow-uninteresting-missing' into maint-1.6.1