Merge pull request #3658 from kumpera/fix-ios-logging