Merge branch '0.4.x' into 0.5.0.x

src/bitcoinrpc.cpp

@@ -1427,7 +1427,7 @@ void ThreadCleanWalletPassphrase(void* parg)
             if (nWalletUnlockTime < nMyWakeTime)
                 nWalletUnlockTime = nMyWakeTime;
         }
-        free(parg);
+        delete (int*)parg;
         return;
     }