Merge branch 'master' into better_exceptions

Author: funbringer

testgres/node.py

@@ -175,7 +175,7 @@ def _create_recovery_conf(self, username):
             u"application_name={} "
             u"port={} "
             u"user={} "
-        ).format(master.name, master.port, username)
+        ).format(self.name, master.port, username)
 
         # host is tricky
         try: