diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 3134dc76ff..8c23eabbb0 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -110,6 +110,9 @@
 		<li>[Fix] Correctly delete excess poll options (Bug #14566)</li>
 		<li>[Fix] Allow names evaluating to false for poll options</li>
 		<li>[Change] use in-build functions for user online list (#14596) - provided by rxu</li>
+		<li>[Fix] Fixing google cache display problems with Firefox (#14472) - patch provided by Raimon</li>
+		<li>[Fix] Prevent topic unlocking if locked by someone else while posting (#10307)</li>
+		<li>[Change] Allow years in future be selected for date custom profile field (#14519)</li>
 
 	</ul>
 
diff --git a/phpBB/includes/functions_profile_fields.php b/phpBB/includes/functions_profile_fields.php
index cbad80e28e..82b78f99fe 100644
--- a/phpBB/includes/functions_profile_fields.php
+++ b/phpBB/includes/functions_profile_fields.php
@@ -113,7 +113,7 @@ class custom_profile
 					return 'FIELD_REQUIRED';
 				}
 
-				if ($day < 0 || $day > 31 || $month < 0 || $month > 12 || ($year < 1901 && $year > 0) || $year > gmdate('Y', time()))
+				if ($day < 0 || $day > 31 || $month < 0 || $month > 12 || ($year < 1901 && $year > 0) || $year > gmdate('Y', time()) + 50)
 				{
 					return 'FIELD_INVALID_DATE';
 				}
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index 45461a56d0..41eb93ce09 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -316,7 +316,7 @@ class ucp_profile
 						$validate_array = array_merge($validate_array, array(
 							'bday_day'		=> array('num', true, 1, 31),
 							'bday_month'	=> array('num', true, 1, 12),
-							'bday_year'		=> array('num', true, 1901, gmdate('Y', time())),
+							'bday_year'		=> array('num', true, 1901, gmdate('Y', time()) + 50),
 						));
 					}
 
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 13b9eeb020..629e811a03 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1187,7 +1187,7 @@ $bbcode_checked		= (isset($post_data['enable_bbcode'])) ? !$post_data['enable_bb
 $smilies_checked	= (isset($post_data['enable_smilies'])) ? !$post_data['enable_smilies'] : (($config['allow_smilies']) ? !$user->optionget('smilies') : 1);
 $urls_checked		= (isset($post_data['enable_urls'])) ? !$post_data['enable_urls'] : 0;
 $sig_checked		= $post_data['enable_sig'];
-$lock_topic_checked	= (isset($topic_lock)) ? $topic_lock : (($post_data['topic_status'] == ITEM_LOCKED) ? 1 : 0);
+$lock_topic_checked	= (isset($topic_lock) && $topic_lock) ? $topic_lock : (($post_data['topic_status'] == ITEM_LOCKED) ? 1 : 0);
 $lock_post_checked	= (isset($post_lock)) ? $post_lock : $post_data['post_edit_locked'];
 
 // If the user is replying or posting and not already watching this topic but set to always being notified we need to overwrite this setting
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index 2f92f91fc8..6d169f58e0 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -42,11 +42,23 @@ html>body dd label input { vertical-align: text-bottom; }	/* Align checkboxes/ra
 	visibility: hidden;
 }*/
 
-.clearfix, #tabs, #minitabs, .post, .navbar, fieldset dl, ul.topiclist dl, ul.linklist, dl.polls {
+.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls {
 	height: 1%;
 	overflow: hidden;
 }
 
+/* viewtopic fix */
+* html .post {
+	height: 25%;
+	overflow: hidden;
+}
+
+/* navbar fix */
+* html .clearfix, * html .navbar, ul.linklist {
+	height: 4%;
+	overflow: hidden;
+}
+
 /* Simple fix so forum and topic lists always have a min-height set, even in IE6
 	From http://www.dustindiaz.com/min-height-fast-hack */
 dl.icon {