Merge remote-tracking branch 'origin/master' into mqttintegration

# Conflicts:
#	src/lib/ebus/datatype.cpp

src/lib/ebus/datatype.cpp

@@ -34,6 +34,7 @@
 namespace ebusd {
 
 using std::dec;
+using std::defaultfloat;
 using std::hex;
 using std::fixed;
 using std::setfill;
@@ -746,7 +747,7 @@ result_t NumberDataType::readSymbols(size_t offset, size_t length, const SymbolS
 result_t NumberDataType::readFromRawValue(size_t length, unsigned int value,
                                           OutputFormat outputFormat, ostream* output) const {
   int signedValue;
-  *output << setw(0) << dec;  // initialize output
+  *output << defaultfloat << setw(0) << dec;  // initialize output
 
   if (!hasFlag(REQ) && value == m_replacement) {
     if (outputFormat & OF_JSON) {