Refactoring of previous commit
Merge remote-tracking branch 'jToxCore/master'
Fixed segfault in codec_settings_to_native
Merge branch 'olologin-master'