Merge commit '143c69a3951b3863356e8b227a61d6099de3ea42' into swat1

* commit '143c69a3951b3863356e8b227a61d6099de3ea42':
  index on swat1: 52b4e6a new bugfix