Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	test/rpcgen_wrapper.sh

diff --cc test/rpcgen_wrapper.sh
index dfc12448d8a9bc054f6336adb0157aa706660e13,d2101b05c1d0bfe81e836fe588ba978056db6ce0..0ba5d4f4b9fe6e9f6d8bc262a595c319399af5a4
--- 1/test/rpcgen_wrapper.sh
--- 2/test/rpcgen_wrapper.sh
+++ b/test/rpcgen_wrapper.sh
@@@ -26,9 -26,17 +26,19 @@@ exit_failed() 
      exit 1
  }
  
+ if [ -x /usr/bin/python2 ] ; then
+   PYTHON2=/usr/bin/python2
+ elif [ "x`which python2`" != x ] ; then
+   PYTHON2=python2
+ else
+   PYTHON2=python
+ fi
+ 
  srcdir=$1
  srcdir=${srcdir:-.}
- ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc
 -${PYTHON2} ${srcdir}/../event_rpcgen.py ${srcdir}/regress.rpc
++
++${PYTHON2} ${srcdir}/../event_rpcgen.py --quiet ${srcdir}/regress.rpc
++
  case "$?" in
   0)
      exit_updated