diff --git a/contribs/pmi2/pmi2_api.c b/contribs/pmi2/pmi2_api.c
index 8854305521f041cad4b99f2f3fd40e6832fc463c..4a1507bba805d59d3b851c37a220c51ab51ced97 100644
--- a/contribs/pmi2/pmi2_api.c
+++ b/contribs/pmi2/pmi2_api.c
@@ -1225,6 +1225,7 @@ static int parse_keyval(char **cmdptr, int *len, char **key, char **val, int *va
 static int create_keyval(PMI2_Keyvalpair **kv, const char *key, const char *val, int vallen)
 {
     int pmi2_errno = PMI2_SUCCESS;
+    int key_len = strlen(key);
     char *key_p;
     char *value_p;
     PMI2U_CHKMEM_DECL(3);
@@ -1234,9 +1235,9 @@ static int create_keyval(PMI2_Keyvalpair **kv, const char *key, const char *val,
 
     PMI2U_CHKMEM_MALLOC(*kv, PMI2_Keyvalpair *, sizeof(PMI2_Keyvalpair), pmi2_errno, "pair");
 
-    PMI2U_CHKMEM_MALLOC(key_p, char *, strlen(key)+1, pmi2_errno, "key");
-    MPIU_Strncpy(key_p, key, strlen(key));
-    key_p[strlen(key)] = '\0';
+    PMI2U_CHKMEM_MALLOC(key_p, char *, key_len+1, pmi2_errno, "key");
+    MPIU_Strncpy(key_p, key, key_len+1);
+    key_p[key_len] = '\0';
 
     PMI2U_CHKMEM_MALLOC(value_p, char *, vallen+1, pmi2_errno, "value");
     memcpy(value_p, val, vallen);
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index dc923d2d075ee5a3f11c8d8a0c65719aa3c0fbb5..96320b28f0863e71578b041984ec12b7990d34c4 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -96,6 +96,7 @@ Lead Slurm developers are:
 <li>Puenlap Lee (Bull)</li>
 <li>Dennis Leepow</li>
 <li>Olli-Pekka Lehto (CSC-IT Center for Science Ltd., Finland)</li>
+<li>Piotr Lesnicki (Bull)</li>
 <li>Bernard Li (Genome Sciences Centre, Canada)</li>
 <li>Eric Lin (Bull)</li>
 <li>Donald Lipari (Lawrence Livermore National Laboratory)</li>
@@ -162,6 +163,6 @@ Lead Slurm developers are:
 <!-- INDIVIDUALS, PLEASE KEEP IN ALPHABETICAL ORDER -->
 </ul>
 
-<p style="text-align:center;">Last modified 7 May 2013</p>
+<p style="text-align:center;">Last modified 3 July 2013</p>
 
 <!--#include virtual="footer.txt"-->