diff --git a/NEWS b/NEWS
index a276812741981b89b149ff89bd8f234a0fb69196..78cfcea37a075bdcf62af75adda844c236162670 100644
--- a/NEWS
+++ b/NEWS
@@ -92,6 +92,10 @@ documents those changes that are of interest to users and admins.
digit suffix should be uppercase if any letters are used as digits.
-- In sched/wiki and sched/wiki2, add support for --cpus-per-task option.
From Miguel Ros, BSC.
+ -- In sched/wiki2, prevent invalid memory pointer (and likely seg fault)
+ for job associated with a partition that has since been deleted.
+ -- In sched/wiki2 plus select/cons_res, prevent invalid memory pointer
+ (and likely seg fault) when a job is requeued.
* Changes in SLURM 1.2.19
=========================
diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1
index eaae816cdd1616afa1ab971e7ee4af1f6ea62135..79394356041c04edd52ab8848acd40fc230d822f 100644
--- a/doc/man/man1/salloc.1
+++ b/doc/man/man1/salloc.1
@@ -52,10 +52,9 @@ a specific time of day (seconds are optional).
You may also specify \fImidnight\fR, \fInoon\fR, or
\fIteatime\fR (4pm) and you can have a time\-of\-day suffixed
with \fIAM\fR or \fIPM\fR for running in the morning or the evening.
-You can also say what day the job will be run, by giving
-a date in the form \fImonth\-name\fR day with an optional year,
-or giving a date of the form \fIMMDDYY\fR or \fIMM/DD/YY\fR
-or \fIDD.MM.YY\fR. You can also
+You can also say what day the job will be run, by specifying
+a date of the form \fIMMDDYY\fR or \fIMM/DD/YY\fR
+or \fIMM.DD.YY\fR. You can also
give times like \fInow + count time\-units\fR, where the time\-units
can be \fIminutes\fR, \fIhours\fR, \fIdays\fR, or \fIweeks\fR
and you can tell SLURM to run the job today with the keyword
diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1
index 98ba528408f1d7eece4030f39a4eb1edd5b2826c..fce4afea2ca0270e1f6bee29573e6f0016afa1bc 100644
--- a/doc/man/man1/sbatch.1
+++ b/doc/man/man1/sbatch.1
@@ -62,10 +62,9 @@ a specific time of day (seconds are optional).
You may also specify \fImidnight\fR, \fInoon\fR, or
\fIteatime\fR (4pm) and you can have a time\-of\-day suffixed
with \fIAM\fR or \fIPM\fR for running in the morning or the evening.
-You can also say what day the job will be run, by giving
-a date in the form \fImonth\-name\fR day with an optional year,
-or giving a date of the form \fIMMDDYY\fR or \fIMM/DD/YY\fR
-or \fIDD.MM.YY\fR. You can also
+You can also say what day the job will be run, by specifying
+a date of the form \fIMMDDYY\fR or \fIMM/DD/YY\fR
+or \fIMM.DD.YY\fR. You can also
give times like \fInow + count time\-units\fR, where the time\-units
can be \fIminutes\fR, \fIhours\fR, \fIdays\fR, or \fIweeks\fR
and you can tell SLURM to run the job today with the keyword
diff --git a/doc/man/man1/scontrol.1 b/doc/man/man1/scontrol.1
index c983e1361aab5aba516e2712d86e99387ff62b01..e903077600ee8fb01739cac0200b8e32e93ed226 100644
--- a/doc/man/man1/scontrol.1
+++ b/doc/man/man1/scontrol.1
@@ -353,10 +353,9 @@ a specific time of day (seconds are optional).
You may also specify \fImidnight\fR, \fInoon\fR, or
\fIteatime\fR (4pm) and you can have a time\-of\-day suffixed
with \fIAM\fR or \fIPM\fR for running in the morning or the evening.
-You can also say what day the job will be run, by giving
-a date in the form \fImonth\-name\fR day with an optional year,
-or giving a date of the form \fIMMDDYY\fR or \fIMM/DD/YY\fR
-or \fIDD.MM.YY\fR. You can also
+You can also say what day the job will be run, by specifying
+a date of the form \fIMMDDYY\fR or \fIMM/DD/YY\fR
+or \fIMM.DD.YY\fR. You can also
give times like \fInow + count time\-units\fR, where the time\-units
can be \fIminutes\fR, \fIhours\fR, \fIdays\fR, or \fIweeks\fR
and you can tell SLURM to run the job today with the keyword
diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1
index aaef6e0aa5b95d578a34e93ad55aed7144a2b3f7..d11fa4c09dbebf5bebd8e412df204ebe21d7ecbb 100644
--- a/doc/man/man1/srun.1
+++ b/doc/man/man1/srun.1
@@ -52,10 +52,9 @@ a specific time of day (seconds are optional).
You may also specify \fImidnight\fR, \fInoon\fR, or
\fIteatime\fR (4pm) and you can have a time\-of\-day suffixed
with \fIAM\fR or \fIPM\fR for running in the morning or the evening.
-You can also say what day the job will be run, by giving
-a date in the form \fImonth\-name\fR day with an optional year,
-or giving a date of the form \fIMMDDYY\fR or \fIMM/DD/YY\fR
-or \fIDD.MM.YY\fR. You can also
+You can also say what day the job will be run, by specifying
+a date of the form \fIMMDDYY\fR or \fIMM/DD/YY\fR
+or \fIMM.DD.YY\fR. You can also
give times like \fInow + count time\-units\fR, where the time\-units
can be \fIseconds\fR (default), \fIminutes\fR, \fIhours\fR,
\fIdays\fR, or \fIweeks\fR and you can tell SLURM to run
diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5
index 9732e3b2e8c4dd3c26fa8eeb0e7f08236cca26bb..9b7984574f0e2e68a57014e4524df6b3dbc41669 100644
--- a/doc/man/man5/slurm.conf.5
+++ b/doc/man/man5/slurm.conf.5
@@ -326,6 +326,11 @@ in the interval specified, it will be forcably terminated.
The default value is 30 seconds.
May not exceed 65533.
+.TP
+\fBMailProg\fR
+Fully qualified pathname to the program used to send email per user request.
+The default value is "/bin/mail".
+
.TP
\fBMaxJobCount\fR
The maximum number of jobs SLURM can have in its active database
@@ -1283,11 +1288,6 @@ users from directly using those resources.
Possible values are "YES" and "NO".
The default value is "NO".
-.TP
-\fBMailProg\fR
-Fully qualified pathname to the program used to send email per user request.
-The default value is "/bin/mail".
-
.TP
\fBMaxNodes\fR
Maximum count of nodes (or base partitions for BlueGene systems) which
diff --git a/src/plugins/sched/wiki2/get_jobs.c b/src/plugins/sched/wiki2/get_jobs.c
index 2b0842a2e01ef982f53878bba466241304dd8403..847cb86ff36914f7ffb4a5c6ac96684c7e555bf0 100644
--- a/src/plugins/sched/wiki2/get_jobs.c
+++ b/src/plugins/sched/wiki2/get_jobs.c
@@ -378,7 +378,8 @@ static void _get_job_comment(struct job_record *job_ptr,
/* SHARED NODES */
if (cr_enabled) { /* consumable resources */
- if (job_ptr->part_ptr->max_share == 0) /* Exclusive use */
+ if (job_ptr->part_ptr &&
+ (job_ptr->part_ptr->max_share == 0)) /* Exclusive use */
sharing = 0;
else if (job_ptr->details && job_ptr->details->shared)
sharing = 1;
diff --git a/src/slurmctld/job_mgr.c b/src/slurmctld/job_mgr.c
index d5f685c1694425a9182b05d68eb237264550530e..e20b32cb91cfe0a48d9cb191cd8d7b74b573b80d 100644
--- a/src/slurmctld/job_mgr.c
+++ b/src/slurmctld/job_mgr.c
@@ -4827,6 +4827,8 @@ extern int job_requeue (uid_t uid, uint32_t job_id, slurm_fd conn_fd)
else
job_ptr->end_time = now;
deallocate_nodes(job_ptr, false, suspended);
+ if (job_ptr->details)
+ xfree(job_ptr->details->req_node_layout);
job_completion_logger(job_ptr);
//FIXME: Test accounting