diff --git a/NEWS b/NEWS
index 1384626167e7f930978266e853d6652d646c422c..c89b10e6ac566642d0e0f702e5ce9f2ec8fd5a95 100644
--- a/NEWS
+++ b/NEWS
@@ -56,6 +56,10 @@ documents those changes that are of interest to users and administrators.
 
 * Changes in Slurm 15.08.7
 ==========================
+ -- sched/backfill: If a job can not be started within the configured
+    backfill_window, set it's start time to 0 (unknown) rather than the end
+    of the backfill_window.
+ -- Remove the 1024-character limit on lines in batch scripts.
 
 * Changes in Slurm 15.08.6
 ==========================
diff --git a/doc/html/team.shtml b/doc/html/team.shtml
index 8d4f394ed05d90487515fb756643526051710623..1c57e8f5b1d2f470a6d6ce898b5841c9dcd4f18c 100644
--- a/doc/html/team.shtml
+++ b/doc/html/team.shtml
@@ -111,6 +111,7 @@ Lead Slurm developers are:
 <li>Takao Hatazaki (HP)</li>
 <li>Matthieu Hautreux (CEA, France)</li>
 <li>Dave Henseler (Cray)</li>
+<li>John Hensley (University of Michigan)</li>
 <li>Chris Holmes (HP)</li>
 <li>David H&ouml;ppner</li>
 <li>Axel Huebl (TU Dresden, Germany)</li>
diff --git a/src/api/job_info.c b/src/api/job_info.c
index 7e96b53075456342bbc5f522b4679b78a3ac0b7d..8b01768c2e9d8ad9c1f58325546f63efc98cde35 100644
--- a/src/api/job_info.c
+++ b/src/api/job_info.c
@@ -338,7 +338,7 @@ slurm_sprint_job_info ( job_info_t * job_ptr, int one_liner )
 	char time_str[32], *group_name, *spec_name, *user_name;
 	char tmp1[128], tmp2[128], tmp3[128], tmp4[128], tmp5[128], tmp6[128];
 	char *tmp6_ptr;
-	char tmp_line[1024];
+	char tmp_line[1024 * 128];
 	char *ionodes = NULL;
 	uint16_t exit_status = 0, term_sig = 0;
 	job_resources_t *job_resrcs = job_ptr->job_resrcs;
diff --git a/src/plugins/sched/backfill/backfill.c b/src/plugins/sched/backfill/backfill.c
index b6144bba7073ff5b5c2aba2ffeff51dca3277b49..6bb95c174f567199bd3d64f28df47ad9dfd352fc 100644
--- a/src/plugins/sched/backfill/backfill.c
+++ b/src/plugins/sched/backfill/backfill.c
@@ -1353,7 +1353,7 @@ next_task:
 
 			/* Job can not start until too far in the future */
 			_set_job_time_limit(job_ptr, orig_time_limit);
-			job_ptr->start_time = sched_start + backfill_window;
+			job_ptr->start_time = 0;
 			if ((orig_start_time != 0) &&
 			    (orig_start_time < job_ptr->start_time)) {
 				/* Can start earlier in different partition */
diff --git a/src/sbatch/opt.c b/src/sbatch/opt.c
index 21236283f534fcb8ac3a811dd5d00861485f6d13..b1477ade577d4608a5a6a1323329adb522ad8619 100644
--- a/src/sbatch/opt.c
+++ b/src/sbatch/opt.c
@@ -958,7 +958,6 @@ static char *_next_line(const void *buf, int size, void **state)
 {
 	char *line;
 	char *current, *ptr;
-	int len;
 
 	if (*state == NULL) /* initial state */
 		*state = (void *)buf;
@@ -970,8 +969,7 @@ static char *_next_line(const void *buf, int size, void **state)
 	while ((*ptr != '\n') && (ptr < ((char *)buf+size)))
 		ptr++;
 
-	len = MIN((ptr-current), 1024);
-	line = xstrndup(current, len);
+	line = xstrndup(current, ptr-current);
 
 	/*
 	 *  Advance state past newline
@@ -996,7 +994,7 @@ static char *
 _get_argument(const char *file, int lineno, const char *line, int *skipped)
 {
 	const char *ptr;
-	char argument[BUFSIZ];
+	char *argument = NULL;
 	char q_char = '\0';
 	bool escape_flag = false;
 	bool quoted = false;
@@ -1016,7 +1014,6 @@ _get_argument(const char *file, int lineno, const char *line, int *skipped)
 	/* copy argument into "argument" buffer, */
 	i = 0;
 	while ((quoted || !isspace(*ptr)) && *ptr != '\n' && *ptr != '\0') {
-
 		if (escape_flag) {
 			escape_flag = false;
 		} else if (*ptr == '\\') {
@@ -1038,9 +1035,10 @@ _get_argument(const char *file, int lineno, const char *line, int *skipped)
 			break;
 		}
 
+		if (!argument)
+			argument = xmalloc(strlen(line) + 1);
 		argument[i++] = *(ptr++);
 	}
-	argument[i] = '\0';
 
 	if (quoted) /* Unmatched quote */
 		fatal("%s: line %d: Unmatched `%c` in [%s]",
@@ -1048,7 +1046,7 @@ _get_argument(const char *file, int lineno, const char *line, int *skipped)
 
 	*skipped = ptr - line;
 
-	return (i > 0 ? xstrdup (argument) : NULL);
+	return argument;
 }
 
 /*
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index e480f83208f7edb20ce045b50b47088a9a97e7a1..9c026b669dbb789c0192fc1755a2aff9005e8520 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -1100,7 +1100,7 @@ int read_slurm_conf(int recover, bool reconfig)
 		}
 	}
 
-	/* NOTE: Run loadd_all_resv_state() before _restore_job_dependencies */
+	/* NOTE: Run load_all_resv_state() before _restore_job_dependencies */
 	_restore_job_dependencies();
 
 	/* sort config_list by weight for scheduling */