Merge branch '0.5.0.x' into 0.5.x

diff --cc src/util.h
index 1ef0e6f,bcb9027..dcf060e
--- 1/src/util.h
--- 2/src/util.h
+++ b/src/util.h
@@@ -292,10 -285,11 +292,14 @@@ public
  
  
  
 +// This is exactly like std::string, but with a custom allocator.
 +// (secure_allocator<> is defined in serialize.h)
 +typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString;
  
+ // This is exactly like std::string, but with a custom allocator.
+ // (secure_allocator<> is defined in serialize.h)
+ typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString;
+