Crypsis cleanup (part 3)
Merge branch 'feature-hmvc' of github.com:mahagr/Kunena-Forum into rtv3
Merge branch 'rtv3' of git://github.com/mahagr/Kunena-Forum into rtv3
recovered ElasticSearch changes again...