fix warlock shard/embers.
Merge branch 'master' of git://tukui.org/Tukui.git