Merge branch 'master' into patch-17

meter/template_test.go

@@ -28,6 +28,7 @@ var acceptable = []string{
 	"(Client.Timeout exceeded while awaiting headers)",                     // http
 	"context deadline exceeded",                                            // LG ESS
 	"no ping response for 192.0.2.2",                                       // SMA
+	"no Speedwire ping response for 127.0.0.1",                             // SMA
 	"no such network interface",                                            // SMA
 	"missing config values: username, password, key",                       // E3DC
 }