Merge branch 'hotfix/20140911-wow'
torrent
Merge branch 'hotfix/20140911-torrent' into develop