FIX : #1477, #1478, #1479
Merge pull request #1685 from KreizIT/3.6

FIX : #1477, #1478, #1479