Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

src/script/zcashconsensus.h

@@ -6,6 +6,8 @@
 #ifndef BITCOIN_ZCASHCONSENSUS_H
 #define BITCOIN_ZCASHCONSENSUS_H
 
+#include <stdint.h>
+
 #if defined(BUILD_BITCOIN_INTERNAL) && defined(HAVE_CONFIG_H)
 #include "config/bitcoin-config.h"
   #if defined(_WIN32)
@@ -46,7 +48,6 @@ enum
 {
     zcashconsensus_SCRIPT_FLAGS_VERIFY_NONE                = 0,
     zcashconsensus_SCRIPT_FLAGS_VERIFY_P2SH                = (1U << 0), // evaluate P2SH (BIP16) subscripts
-    zcashconsensus_SCRIPT_FLAGS_VERIFY_DERSIG              = (1U << 2), // enforce strict DER (BIP66) compliance
     zcashconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 9), // enable CHECKLOCKTIMEVERIFY (BIP65)
 };