Fix malloc(0) warning in clang.
Merge pull request #6 from bellgrim/clang

Fix malloc(0) warning in clang.
Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop