Initial commit
Merge branch 'master' into distributed-pbx
.
Merge branch 'master' into distributed-pbx
Bugfixes