diff --git a/.travis/release.sh b/.travis/release.sh
index 2508d891ac..028ff6f20a 100644
--- a/.travis/release.sh
+++ b/.travis/release.sh
@@ -2,11 +2,8 @@
 set -e
 
 echo "BUILD: $BUILD"
-if [ "${BUILD}" != "deploy" ]; then
-    echo "Skipping deployment script, it needs to run only once"
-    exit 0
-fi
 
+if [ "${BUILD}" = "deploy" ]; then
 
 RELEASE_VERSION=$(./mvnw -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.5.0:exec | tail -1)
 
@@ -46,8 +43,11 @@ else
     echo "Update OK"
 fi
 
+fi
 
 
+if [ "${BUILD}" = "site" ]; then
+
 echo "Adding the site to pmd.github.io..."
 # clone pmd.github.io. Note: This uses the ssh key setup earlier
 # In order to speed things up, we use a sparse checkout - no need to checkout all directories here
@@ -71,3 +71,5 @@ mkdir pmd.github.io
     git push origin master
 )
 
+fi
+
diff --git a/do-release.sh b/do-release.sh
index 33e1b9c530..60acc95b32 100755
--- a/do-release.sh
+++ b/do-release.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Make sure, everything is English...
+export LANG=C.UTF8
+
 # verify the current directory
 if [ ! -f pom.xml -o ! -d ../pmd.github.io ]; then
     echo "You seem to be in the wrong working directory or you don't have pmd.github.io checked out..."
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
index 05c2c7bb7c..89d42efa67 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/ast/ASTLambdaExpression.java
@@ -14,6 +14,11 @@ public class ASTLambdaExpression extends AbstractJavaAccessNode {
     public ASTLambdaExpression(JavaParser p, int id) {
         super(p, id);
     }
+  
+    @Override
+    public boolean isFindBoundary() {
+        return true;
+    }
 
     /** Accept the visitor. **/
     public Object jjtAccept(JavaParserVisitor visitor, Object data) {
diff --git a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConstructorCallsOverridableMethod.xml b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConstructorCallsOverridableMethod.xml
index 2bbff6de25..7ca35de4cb 100644
--- a/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConstructorCallsOverridableMethod.xml
+++ b/pmd-java/src/test/resources/net/sourceforge/pmd/lang/java/rule/design/xml/ConstructorCallsOverridableMethod.xml
@@ -105,6 +105,23 @@ public class Foo {
     </test-code>
     <test-code>
         <description><![CDATA[
+method in lambda expression is ok
+     ]]></description>
+        <expected-problems>0</expected-problems>
+        <code><![CDATA[
+public class Foo {
+ public Foo(String s) {
+  addActionListener(() -> bar());
+  addActionListener(() -> { bar(); });
+  addActionListener((a) -> { bar(); });
+  addActionListener(this::bar);
+ }
+ public void bar() {}
+}
+     ]]></code>
+    </test-code>    
+    <test-code>
+        <description><![CDATA[
 bug report 975407
      ]]></description>
         <expected-problems>0</expected-problems>
diff --git a/src/site/markdown/overview/changelog.md b/src/site/markdown/overview/changelog.md
index f0aac6976c..9960fbe1bb 100644
--- a/src/site/markdown/overview/changelog.md
+++ b/src/site/markdown/overview/changelog.md
@@ -17,7 +17,14 @@ This is a minor release.
 
 ### Fixed Issues
 
+*   General
+    *   [#407](https://github.com/pmd/pmd/issues/407): \[web] Release date is not properly formatted
+*   java-design
+    *   [#397](https://github.com/pmd/pmd/issues/397): \[java] ConstructorCallsOverridableMethodRule: false positive for method called from lambda expression
+
 ### API Changes
 
 ### External Contributions
 
+*   [#406](https://github.com/pmd/pmd/pull/406): \[java] False positive with lambda in java-design/ConstructorCallsOverridableMethod
+