Merge branch 'next'

* next:
  fix, PEBKAC, free beef resources in unsermon after usage