Merge branch 'master' into emc2p/BR_V1_3_6

diff --git a/src/engine_swig/engtypemaps.i b/src/engine_swig/engtypemaps.i
index 5d05c099915f09e9440ea1e78adace021b67e8e9..c01020cd92b3b76f86bb04a71a51ddabdb76f0d2 100644 (file)
--- a/src/engine_swig/engtypemaps.i
+++ b/src/engine_swig/engtypemaps.i
@@ -1006,7 +1006,7 @@ public:
 %template(tname)      std::map<std::string, T* >;
 %pythoncode
 {
-from collections import MutableMapping    
+from collections.abc import MutableMapping
 class tname(tname,MutableMapping):pass
 import sys
 sys.modules['_'+__name__].##tname##_swigregister(tname)