Merge branch 'development' into dtls

* development:
  Add attribution
  Fix ignore patterns for windows cmake again
diff --git a/.gitignore b/.gitignore
index bbf7822..916d731 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,9 @@
 *.gcda
 
 # MSVC files generated by CMake:
-*.filters
+/*.sln
+/*.vcxproj
+/*.filters
 
 # MSVC build artifacts:
 *.exe
diff --git a/ChangeLog b/ChangeLog
index 4e21960..1cfe472 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,7 +68,8 @@
      key exchanges enabled needs certificates. This fixes a possible interop
      issue with some servers when a zero-length extension was sent. (Reported
      by Peter Dettman.)
-   * On a 0-length input, base64_encode() did not correctly set output length.
+   * On a 0-length input, base64_encode() did not correctly set output length
+     (found by Hendrik van den Boogaard).
 
 Changes
    * Use deterministic nonces for AEAD ciphers in TLS by default (possible to