lol musium
Merge branch 'hotfix/20141031-lol'