Fixes for Swift 4.1#32

Open

lesmuc wants to merge 2 commits intoartemkrachulov:masterfrom

Commits on Jul 9, 2018

Fixes for Swift 4.1
Udo von Eynern
committed

Commits on Oct 11, 2018

Fixes for Swift 4.2
Udo von Eynern
committed