Merge branch 'v2.1' into v2.2

CHANGES/v2.1.txt

@@ -215,7 +215,7 @@ For developers:
 - Improved make cppcheck options.
 - Fixes in developer documentation.
 
-Version 2.1.4 (coming soon)
+Version 2.1.4 (Oct 13, 2015)
 -----------------------------
 
 For users:

release.sh

@@ -153,6 +153,7 @@ else
   echo "push it to origin and create a tgz file"
   echo "I will use the following commands:"
   echo "***"
+  echo "git add CHANGES/v$shortversion.txt"
   echo "git add VERSION"
   echo "git commit --allow-empty -m \"$msg\""
   echo "git tag v$version"