diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/html-pages.xsl b/jOOQ-manual/src/main/resources/org/jooq/web/html-pages.xsl
index f2d883d2a2..063d0d7034 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/html-pages.xsl
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/html-pages.xsl
@@ -50,6 +50,7 @@
     <xsl:param name="relativePath"/>
     <xsl:param name="root"/>
     <xsl:param name="minorVersion"/>
+    <xsl:param name="currentVersion"/>
     <xsl:param name="bnf"/>
 
     <xsl:variable name="apos">&apos;</xsl:variable>
@@ -65,6 +66,26 @@
 &lt;?php
 // The following content has been XSL transformed from manual.xml using html-pages.xsl
 // Please do not edit this content manually
+</xsl:text>
+        <xsl:if test="$minorVersion != $currentVersion">
+            <xsl:text disable-output-escaping="yes">
+$canonical = true;
+function printCanonical() {
+?&gt;
+</xsl:text>
+    <link rel="canonical">
+        <xsl:attribute name="href">
+            <xsl:text>https://www.jooq.org</xsl:text>
+            <xsl:apply-templates select="/manuals/manual[@version = $currentVersion]//section[@id = $sectionID]" mode="href-latest"/>
+        </xsl:attribute>
+    </link>
+    <xsl:text disable-output-escaping="yes">
+&lt;?php
+}
+</xsl:text>
+        </xsl:if>
+
+        <xsl:text>
 require '</xsl:text>
         <xsl:value-of select="$relativePath"/>
 <xsl:text disable-output-escaping="yes">frame.php';
@@ -210,6 +231,20 @@ function printContent() {
         <xsl:text>/</xsl:text>
     </xsl:template>
 
+    <xsl:template match="section" mode="href-latest">
+        <xsl:choose>
+            <xsl:when test="name(../..) = 'section'">
+                <xsl:apply-templates select="../.." mode="href-latest"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>&lt;?=$root?&gt;/doc/latest/</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+
+        <xsl:value-of select="@id"/>
+        <xsl:text>/</xsl:text>
+    </xsl:template>
+
     <xsl:template match="section" mode="prev-next">
         <xsl:variable name="prev" select="(preceding::section | ancestor::section)[last()]"/>
         <xsl:variable name="prevhref">
diff --git a/jOOQ-release/release/template/RELEASENOTES.txt b/jOOQ-release/release/template/RELEASENOTES.txt
index 87acce2e91..850aefd564 100644
--- a/jOOQ-release/release/template/RELEASENOTES.txt
+++ b/jOOQ-release/release/template/RELEASENOTES.txt
@@ -10,6 +10,25 @@ http://www.jooq.org/notes
 For a text version, see
 http://www.jooq.org/inc/RELEASENOTES.txt
 
+Version 3.10.5 - February 15, 2018
+================================================================================
+
+This is a 3.10 patch release with bug fixes
+
+Features and Improvements
+-------------------------
+#7088 - Add support for SET SCHEMA and SET CATALOG
+
+Bug Fixes
+---------
+#7080 - Support PostgreSQL SMALLSERIAL and BIGSERIAL types in parser / DDLDatabase
+#7090 - Parser and DDLDatabase cannot parse certain PostgreSQL types
+#7092 - ParsingStatement is not overriding all methods from DefaultStatement
+#7110 - Compilation error in generated DAOs when primary key is a composite type
+#7128 - NPE while fetching certain indexes during code generation
+#7159 - Add public internal API for use by code generator (to work around Scala issues)
+#7170 - Various parser bugs / missing features
+
 
 Version 3.10.4 - January 16, 2018
 ================================================================================
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index ba9c27ff94..76612bdb90 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -6046,9 +6046,12 @@ final class ParserImpl implements Parser {
                 else if (parseKeywordIf(ctx, "TIMESTAMP")) {
                     Integer precision = parseDataTypePrecision(ctx);
 
+
                     if (parseKeywordIf(ctx, "WITH TIME ZONE"))
                         return precision == null ? SQLDataType.TIMESTAMPWITHTIMEZONE : SQLDataType.TIMESTAMPWITHTIMEZONE(precision);
-                    else if (parseKeywordIf(ctx, "WITHOUT TIME ZONE") || true)
+                    else
+
+                    if (parseKeywordIf(ctx, "WITHOUT TIME ZONE") || true)
                         return precision == null ? SQLDataType.TIMESTAMP : SQLDataType.TIMESTAMP(precision);
                 }
 
@@ -6058,9 +6061,12 @@ final class ParserImpl implements Parser {
                 else if (parseKeywordIf(ctx, "TIME")) {
                     Integer precision = parseDataTypePrecision(ctx);
 
+
                     if (parseKeywordIf(ctx, "WITH TIME ZONE"))
                         return precision == null ? SQLDataType.TIMEWITHTIMEZONE : SQLDataType.TIMEWITHTIMEZONE(precision);
-                    else if (parseKeywordIf(ctx, "WITHOUT TIME ZONE") || true)
+                    else
+
+                    if (parseKeywordIf(ctx, "WITHOUT TIME ZONE") || true)
                         return precision == null ? SQLDataType.TIME : SQLDataType.TIME(precision);
                 }