WoW patch
Merge branch 'hotfix/20140911-wow'