diff --git a/NEWS b/NEWS
index a068f69225a5290f166f92270171fb9700c6ac3c..072181924efeaa1409d389238c826b93a1d7dab0 100644
--- a/NEWS
+++ b/NEWS
@@ -57,6 +57,7 @@ documents those changes that are of interest to users and admins.
 * Changes in Slurm 2.6.2
 ========================
  -- Fix issue with reconfig and GrpCPURunMins
+ -- Fix of wrong node/job state problem after reconfig
 
 * Changes in Slurm 2.6.1
 ========================
diff --git a/contribs/README b/contribs/README
index 990d250cfb6ddebd07da76a899bd2067438278dc..c6d05ac1672cb52e76f2f3e54a32ff7ba81f7cc0 100644
--- a/contribs/README
+++ b/contribs/README
@@ -132,3 +132,4 @@ of the SLURM contribs distribution follows:
   torque/            [ Wrapper Scripts for Torque migration to SLURM ]
      Helpful scripts to make transition to SLURM easier from PBS or Torque.
      These scripts are easily updatable if there is functionality missing.
+     NOTE: For the showq command, see https://github.com/pedmon/slurm_showq
diff --git a/doc/html/download.shtml b/doc/html/download.shtml
index 78d8a7f5a662ac06284184f0d79c2fab43d651b9..986a432c86c77c5030822d336b2547c119a6fb93 100644
--- a/doc/html/download.shtml
+++ b/doc/html/download.shtml
@@ -104,6 +104,7 @@ https://github.com/alanorth/hpc_infrastructure_scripts/blob/master/slurm/interac
 The <b>topology.conf</b> file for an Infiniband switch can be automatically
 generated using the <b>ib2slurm</b> tool found here:
 <a href="https://github.com/fintler/ib2slurm">https://github.com/fintler/ib2slurm</a>.
+</ul>
 
 <li><b>I/O Watchdog</b><br>
 A facility for monitoring user applications, most notably parallel jobs,
@@ -160,6 +161,11 @@ Maui Scheduler</a></li>
 Moab Cluster Suite</a></li>
 </ul><br>
 
+<li><b>Command wrappers</b><br>
+There is a wrapper for Maui/Moab's showq command at
+<a href="https://github.com/pedmon/slurm_showq">
+https://github.com/pedmon/slurm_showq</a>.
+
 <li><b>Scripting interfaces</b>
 <ul>
 <li>A <b>Perl</b> interface is included in the SLURM distribution in the
@@ -228,6 +234,6 @@ For more information, see
 
 </ul>
 
-<p style="text-align:center;">Last modified 19 August 2013</p>
+<p style="text-align:center;">Last modified 21 August 2013</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/doc/html/faq.shtml b/doc/html/faq.shtml
index 6c22c35b1af89f7f31d9b7bba6fe5dffab152592..42d24d97ad240ead59b787a127a05865556e5116 100644
--- a/doc/html/faq.shtml
+++ b/doc/html/faq.shtml
@@ -158,6 +158,8 @@ script for Slurm?</a></li>
 <li><a href="#salloc_default_command">Can the salloc command be configured to
 launch a shell on a node in the job's allocation?</a></li>
 <li><a href="#upgrade">What should I be aware of when upgrading Slurm?</a></li>
+<li><a href="#torque">How easy is it to switch from PBS or Torque to Slurm?</a></li>
+<li><a href="#sssd">I am having trouble using SSSD with Slurm.</a></li>
 </ol>
 
 <h2>For Management</h2>
@@ -1688,8 +1690,31 @@ SallocDefaultCommand="srun -n1 -N1 --mem-per-cpu=0 --pty --preserve-env --mpi=no
 See the Quick Start Administrator Guide <a href="quickstart_admin.html#upgrade">Upgrade</a>
 section for details.</p>
 
+<p><a name="torque"><b>52. How easy is it to switch from PBS or Torque to Slurm?</b></a></br>
+A lot of users don't even notice the difference.
+Slurm has wrappers available for the mpiexec, pbsnodes, qdel, qhold, qrls,
+qstat, and qsub commands (see contribs/torque in the distribution and the
+"slurm-torque" RPM).
+There is also a wrapper for the showq command at
+<a href="https://github.com/pedmon/slurm_showq">
+https://github.com/pedmon/slurm_showq</a>.
+Slurm recognizes and translates the "#PBS" options in batch scripts.
+Most, but not all options are supported.
+Please share any enhancements that you make.</p>
+
+<p><a name="sssd"><b>53. I am having trouble using SSSD with Slurm.</b></a></br>
+SSSD or System Security Services Deamon does not allow enumeration of group
+members by default.
+SSSD is also case sensitive, which could possible raise other issues.
+Add the following lines to <i>/etc/ssd/ssd.conf</i> on your head node to
+address these issues:</p>
+<pre>
+enumerate = True
+case_sensitive = False
+</pre>
+
 <p class="footer"><a href="#top">top</a></p>
 
-<p style="text-align:center;">Last modified 16 August 2013</p>
+<p style="text-align:center;">Last modified 21 August 2013</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index f60327629caba0d6aeece93f23e668c86a07edce..ba4b42d935284168a26e49262eb9b9d9745dcb3b 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -1711,9 +1711,15 @@ static int _sync_nodes_to_active_job(struct job_record *job_ptr)
 	uint16_t node_flags;
 	struct node_record *node_ptr = node_record_table_ptr;
 
-	job_ptr->node_cnt = bit_set_count(job_ptr->node_bitmap);
+	if (job_ptr->node_bitmap_cg) /* job completing */
+		job_ptr->node_cnt = bit_set_count(job_ptr->node_bitmap_cg);
+	else
+		job_ptr->node_cnt = bit_set_count(job_ptr->node_bitmap);
 	for (i = 0; i < node_record_count; i++, node_ptr++) {
-		if (bit_test(job_ptr->node_bitmap, i) == 0)
+		if (job_ptr->node_bitmap_cg) { /* job completing */
+			if (bit_test(job_ptr->node_bitmap_cg, i) == 0)
+				continue;
+		} else if (bit_test(job_ptr->node_bitmap, i) == 0)
 			continue;
 
 		node_flags = node_ptr->node_state & NODE_STATE_FLAGS;