Merge branch 'hotfix-curl'
Merge branch 'develop'
Merge branch 'develop'
Backtrace depth has to be increased by 1 to show correct filename and line number

Signed-off-by: Peter Legierski <peter@legierski.net>
Merge branch 'hotfix-all' into develop