Merge branch 'master' into develop

Conflicts:
	lib/cr_vmware_tpl/handler.py

diff --cc lib/cr_vmware_tpl/handler.py
index c887d2f4456741244a86f460d4e78b54d0261e5e,5cb203307230e4c2d090d9255737f37859996b6b..23b7d04a11a4ea1526445527cbccd9af48b675a2
--- 1/lib/cr_vmware_tpl/handler.py
--- 2/lib/cr_vmware_tpl/handler.py
+++ b/lib/cr_vmware_tpl/handler.py
@@@ -36,7 -36,7 +36,8 @@@ from .obj import PpBaseObjec
  
  from .config import CrTplConfiguration
  
- __version__ = '0.9.3'
 -__version__ = '0.9.2.1'
++__version__ = '0.9.4'
++
  LOG = logging.getLogger(__name__)
  TZ = pytz.timezone('Europe/Berlin')