Merge remote branch 'stew/contents' into merge

* stew/contents:
  bride of bad index name
  return of bad index name
  bad index name
  you can quote me on that
  lalalal
  those are strings not ints
  another wrong way to paramaterize
  wrong way to paramaterize
  really don't use DBConn() in an update
  don't use DBConn() in an update

Signed-off-by: Joerg Jaspert <joerg@debian.org>