Attempting manual merge for Nature's Bounty
Merge branch 'master' of git://github.com/EQEmu/Server