Merge branch 'sk/calloc-not-malloc-plus-memset'

Code clean-up. * sk/calloc-not-malloc-plus-memset: git: use calloc instead of malloc + memset where possible