diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index ba1e45c06..b09386225 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -6,6 +6,10 @@
 6.8.5
  - fix [ 1396957 ] Insufficient privileges check on the DataForm
  - fix [ 1403466 ] CS Attachments - Broken Image Issue
+ - fix [ 1406633 ] Env and User macros broken (Thanks to Eric Kennedy for
+		   the patch)
+ - fix [ 1404485 ] userDefined1 to 5 onlineHelp
+ - fix [ 1403155 ] Poll shows no result
 
 6.8.4
  - fix [ 1395371 ] XSS Vulnerability in DataForm Entries
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 6a1dd6e10..7e96c64c0 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -330,6 +330,7 @@ sub www_vote {
 			$u->karma($self->get("karmaPerVote"),"Poll (".$self->getId.")","Voted on this poll.");
 		}
 		$self->deletePageCache;
+		$self->getContainer->purgeCache;
 	}
 	return $self->getContainer->www_view;
 }
diff --git a/lib/WebGUI/i18n/English/Asset_Post.pm b/lib/WebGUI/i18n/English/Asset_Post.pm
index 7e2dead98..b465c90c5 100644
--- a/lib/WebGUI/i18n/English/Asset_Post.pm
+++ b/lib/WebGUI/i18n/English/Asset_Post.pm
@@ -389,6 +389,28 @@ A conditional indicating whether this Post should be hidden from navigation.
 A conditional indicating whether this Post should be opened in a new window.
 <p>
 
+<b>userDefined1, userDefined2, userDefined3, userDefined4, userDefined5</b><br>
+You can use up to 5 user defined fields. The fields are
+called "userDefined1" through "userDefined5". In the
+Post Form template you can use those variables like
+this to collect data:
+
+<blockquote>
+&lt;tmpl_var userDefined1.form&gt; (text)<br>
+
+&lt;tmpl_var userDefined1.form.yesNo&gt; (yes / no) <br>
+
+&lt;tmpl_var userDefined1.form.textarea&gt; (textarea) <br>
+
+&lt;tmpl_var userDefined1.form.htmlarea&gt; (rich edit box) <br>
+
+</blockquote>
+
+Then in the Thread and Main CS templates you can call
+back the data with a simple &lt;tmpl_var userDefined1&gt;. 
+
+<p>
+
 |,
 		lastUpdated => 1134670360,
 	},