Merge branch 'master', remote-tracking branch 'origin/master'
Merge branch 'master', remote-tracking branch 'origin/master'
add #ifdef __cplusplus to C headers so that they can be also used in Cpp