c
Merge branch 'performance' of https://github.com/asmoljo/forum.git into
performance