(hopefully) Final fix for ZAS for 0.1.4.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #3827 from Mloc/weirdair

(hopefully) Final fix for ZAS for 0.1.4.
Hopefully.  Hopefully was the key word.

Signed-off-by: Mloc <colmohici@gmail.com>
Merge pull request #3828 from Mloc/zas

Hopefully.  Hopefully was the key word.
Merge remote-tracking branch 'upstream/master' into dev-freeze
Fix for #3826.
Fix for acid pouring.
Merge pull request #3829 from Segrain/dev-freeze

Dev-freeze attackby() returns.