Merge branch 'stable/v2.13'

diff --cc mount/swapon.c
index 33d2b135f6d5081a5f0e7594af90e88666e11932,e97f83542db913061684d8e372ecd80ff06b0614..23c92e44186597fbc3acf2e75bd6473ca3dee608
--- 1/mount/swapon.c
--- 2/mount/swapon.c
+++ b/mount/swapon.c
@@@ -18,11 -18,10 +18,13 @@@
  #include "nls.h"
  #include "fsprobe.h"
  #include "realpath.h"
 -#include "mount_paths.h"
 +#include "pathnames.h"
 +#include "sundries.h"
 +
 +#define PATH_MKSWAP   "/sbin/mkswap"
  
+ #define PATH_MKSWAP   "/sbin/mkswap"
+ 
  #ifdef HAVE_SYS_SWAP_H
  # include <sys/swap.h>
  #endif