Merge pull request #3397 from Erthilo/master

Bugfixes.
Merge pull request #3398 from Erthilo/master

Moar fixes.
Type mismatch fix.
Merge pull request #3401 from Segrain/master

ERT cameras on master.
Piping and wiring fixes.
Merge pull request #3402 from Segrain/master

Mapfixes.
Fix for #3406.
Fix for #3383. Again.
Fix for #3410.
Merge pull request #3409 from Segrain/master

Bugfixes.