Merge branch 'master' into win32-x64-working

diff --cc src/mon.c
index aba954425bfd33caf5909011bc8b0b8948e41e08,7acc266707a6d3fecdf22a4836cb6815342aab3a..9c339a59d23a25e5cf7876125a214d7950900c46
--- 1/src/mon.c
--- 2/src/mon.c
+++ b/src/mon.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        mon.c   $NHDT-Date: 1430365894 2015/04/30 03:51:34 $  $NHDT-Branch: master $:$NHDT-Revision: 1.168 $ */
+ /* NetHack 3.5        mon.c   $NHDT-Date: 1430396792 2015/04/30 12:26:32 $  $NHDT-Branch: master $:$NHDT-Revision: 1.169 $ */
 -/* NetHack 3.5        mon.c   $Date: 2012/05/16 02:15:10 $  $Revision: 1.126 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */