Merge branch 'dev' into b2g
problem with Null/Null
fixed the div error (there is __truediv__!)
Merge branch 'dev' into talos
Do not try to json-decode revision numbers, especially ones like \d+e\d+   :/
changes for using alert_manager database