Merged. Some changes that should already have been incuded during previous merge (mostly about PlcStatus) have been included this time.
.project
.directory
.pytest_cache
.cache
.coverage_full
syntax: regexp
^tests/.*/build$
^.idea/.*
syntax: regexp
^.*\.pyc$
syntax: regexp
^.*~$
syntax: regexp
^.*\.swp$
bug_report.*\.txt
i18n/.*.new$
revision
doc/_build
doc/locale