Code

Merge branch 'jc/maint-refs-dangling'