Merge branch 'next'

* next:
  minor, link stuff that uses m30 string opers with uterus_LIBS