diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 3efc88c99..be6df89cb 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -98,6 +98,12 @@
  - Help for forms now shows the fields that you should see with your UI level.
    There is a link to show all fields.
  - added [ 732011 ] http header cache setting
+ - added [ 810556 ] larger value field in userSessionScratch table
+ - added [ 881817 ] allowed characters in username
+ - added [ 1231386 ] Insert WebGUI Image
+ - fix [ 1178981 ] IE is in "quirks mode" - multi-column layout templates
+   break
+ - fix [ 999590 ] Rating
  - fix [ 1410577 ] WebGUI::Session not included
  - fix a bug where a link was provided to become or delete non-existant users.
  - fix bugs with the in-memory session caching of user and group memberships
diff --git a/docs/upgrades/upgrade_6.8.8-6.99.0.pl b/docs/upgrades/upgrade_6.8.8-6.99.0.pl
index 62cea98ad..98a80f950 100644
--- a/docs/upgrades/upgrade_6.8.8-6.99.0.pl
+++ b/docs/upgrades/upgrade_6.8.8-6.99.0.pl
@@ -49,10 +49,17 @@ updateMatrix();
 updateFolder();
 addRichEditUpload();
 updateArticle();
+updateScratch();
 installSQLForm();
 
 finish($session); # this line required
 
+#-------------------------------------------------
+sub updateScratch {
+	print "\tIncreasing size of scratch variables.\n";
+	$session->db->write("alter table userSessionScratch change value value text");
+}
+
 #-------------------------------------------------
 sub updateArticle {
 	print "\tAllowing articles to have direct attachments.\n";
@@ -929,6 +936,7 @@ EOT
 	$asset->addRevision({template=>$template});
 }
 
+#-------------------------------------------------
 sub installSQLForm {
 	print "\tInstalling SQLForm tables.\n" unless ($quiet);
 	
@@ -1001,6 +1009,7 @@ ENDOFQUERY5
 	$session->db->write("insert into SQLForm_regexes (regexId, name, regex) values ('defaultUnsigned', 'Unsigned integer', '^\\\\d+\$')");
 	$session->db->write("insert into SQLForm_regexes (regexId, name, regex) values ('defaultSigned', 'Signed integer', '^-?\\\\d+\$')");
 	$session->db->write("insert into SQLForm_regexes (regexId, name, regex) values ('defaultFloat', 'Floating point number', '^-?\\\\d+(\\.\\\\d+)?\$')");
+	$session->config->addToArray("assets","WebGUI::Asset::Wobject::SQLForm");
 }
 
 
diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm
index 3c5c89d35..d179d0cb2 100644
--- a/lib/WebGUI/Auth.pm
+++ b/lib/WebGUI/Auth.pm
@@ -86,9 +86,6 @@ sub _isValidUsername {
    if ($username eq "") {
       $error .= '<li>'.$i18n->get(725).'</li>';
    }
-   unless ($username =~ /^[A-Za-z0-9\-\_\.\,\@]+$/) {
-   	  $error .= '<li>'.$i18n->get(747).'</li>';
-   }
    $self->error($error);
    return $error eq "";
 }
diff --git a/lib/WebGUI/Operation/FormHelpers.pm b/lib/WebGUI/Operation/FormHelpers.pm
index bb5a313f2..e456a4820 100644
--- a/lib/WebGUI/Operation/FormHelpers.pm
+++ b/lib/WebGUI/Operation/FormHelpers.pm
@@ -45,14 +45,15 @@ sub www_formAssetTree {
 	}
 	my $output = '<p>'.join(" &gt; ", @crumb)."</p>\n";
 	my $children = $base->getLineage(["children"],{returnObjects=>1});
+	my $i18n = WebGUI::International->new($session);
 	foreach my $child (@{$children}) {
 		next unless $child->canView;
 		if ($child->get("className") =~ /^$session->form->process("classLimiter")/) {
 			$output .= '<a href="#" onclick="window.opener.document.getElementById(\''.$session->form->process("formId")
 				.'\').value=\''.$child->getId.'\';window.opener.document.getElementById(\''.
-				$session->form->process("formId").'_display\').value=\''.$child->get("title").'\';window.close();">(&bull;)</a> ';
+				$session->form->process("formId").'_display\').value=\''.$child->get("title").'\';window.close();">['.$i18n->get("select").']</a> ';
 		} else {
-			$output .= "(&bull;) ";
+			$output .= "[".$i18n->get("select")."] ";
 		}
 		$output .= '<a href="'.$child->getUrl("op=formAssetTree;classLimiter=".$session->form->process("classLimiter").";formId="
 			.$session->form->process("formId")).'">'.$child->get("menuTitle").'</a>'."<br />\n";	
@@ -118,7 +119,7 @@ function createLink() {
 	my $children = $base->getLineage(["children"],{returnObjects=>1});
 	foreach my $child (@{$children}) {
 		next unless $child->canView;
-		$output .= '<a href="#" onclick="document.getElementById(\'url_formId\').value=\''.$child->get("url").'\'">(&bull;)</a> <a href="'.$child->getUrl("op=richEditPageTree").'">'.$child->get("menuTitle").'</a>'."<br />\n";	
+		$output .= '<a href="#" onclick="document.getElementById(\'url_formId\').value=\''.$child->get("url").'\'">['.$i18n->get("select").']</a> <a href="'.$child->getUrl("op=richEditPageTree").'">'.$child->get("menuTitle").'</a>'."<br />\n";	
 	}
 	$session->style->useEmptyStyle("1");
 	return $output.'</fieldset></fieldset>';
@@ -167,9 +168,9 @@ sub www_richEditImageTree {
 	foreach my $child (@{$children}) {
 		next unless $child->canView;
 		if ($child->get("className") =~ /^WebGUI::Asset::File::Image/) {
-			push(@output, '<a href="'.$child->getUrl("op=richEditViewThumbnail").'" target="viewer">(&bull;)</a> ');
+			push(@output, '<a href="'.$child->getUrl("op=richEditViewThumbnail").'" target="viewer">['.$i18n->get("select","WebGUI").']</a> ');
 		} else {
-			push(@output, "(&bull;) ");
+			push(@output, "[".$i18n->get("select","WebGUI")."] ");
 		}
 		push(@output, '<a href="'.$child->getUrl("op=richEditImageTree").'">'.$child->get("menuTitle").'</a>'."<br />\n");
 	}
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index 9819dcccf..3365ad02c 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -1,6 +1,12 @@
 package WebGUI::i18n::English::WebGUI;
 
 our $I18N = {
+	'select' => {
+		message => q|Select|,
+		lastUpdated => 0,
+		context=>"form helpers"
+	},
+
 	'mail return path help' => {
 		message => q|To what email address should undeliverable messages be sent?|,
 		lastUpdated => 0,
@@ -1949,11 +1955,6 @@ default WebGUI groups such as Admin or Content Manager.</p> |,
 		lastUpdated => 1039587250
 	},
 
-	'747' => {
-		message => q|Usernames must contain only alpha-numeric characters, dashes, underscores, periods, commas or @ signs.|,
-		lastUpdated => 1129431985
-	},
-
 	'159' => {
 		message => q|Inbox|,
 		lastUpdated => 1031514049