Merge remote-tracking branch 'upstream/master'

Conflicts:
	mbus/mbus-protocol-aux.h

mbus/mbus-protocol.h

@@ -21,6 +21,10 @@
 #include <stdlib.h>
 #include <time.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //
 // Packet formats:
 //
@@ -632,5 +636,9 @@ u_char mbus_dif_datalength_lookup(u_char dif);
 char *mbus_frame_get_secondary_address(mbus_frame *frame);
 int   mbus_frame_select_secondary_pack(mbus_frame *frame, char *address);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _MBUS_PROTOCOL_H_ */