Fix broken import
Merge branch 'master' of https://github.com/LLK/s2forums