Merge branch 'enhanced_mplayer' into develop
Water elemental paralysis attack longer duration
Merge branch 'develop' into 350-prerelease