Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

src/script/script_error.cpp

@@ -67,6 +67,8 @@ const char* ScriptErrorString(const ScriptError serror)
             return "NOPx reserved for soft-fork upgrades";
         case SCRIPT_ERR_PUBKEYTYPE:
             return "Public key is neither compressed or uncompressed";
+        case SCRIPT_ERR_CRYPTOCONDITION_INVALID_FULFILLMENT:
+            return "Crypto-Condition payload is invalid";
         case SCRIPT_ERR_UNKNOWN_ERROR:
         case SCRIPT_ERR_ERROR_COUNT:
         default: break;