Merge branch 'master' into fix-abbreviations

diff --cc tests/check_mem_leaks.c
index 52ded659f73a5914f27073bea43754a54618aa6c,ee7cd7e8436d502da900fb8810a36de69bcf1f93..29b4475f41018ed77510173fad5790a0aaee3ec0
--- 1/tests/check_mem_leaks.c
--- 2/tests/check_mem_leaks.c
+++ b/tests/check_mem_leaks.c
@@@ -32,9 -32,9 +32,9 @@@
  #include "config.h"
  #include "check_check.h"
  
- int main ()
+ int main (void)
  {
 -    int n;
 +    int number_failed;
      SRunner *sr;
  
      /*