Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

src/gtest/utils.cpp

@@ -1,7 +1,3 @@
-#include "zcash/JoinSplit.hpp"
-
-ZCJoinSplit* params = ZCJoinSplit::Unopened();
-
 int GenZero(int n)
 {
     return 0;