Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md

test/smime-certs/mksmime-certs.sh

@@ -1,4 +1,11 @@
 #!/bin/sh
+# Copyright 2013-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
 
 # Utility to recreate S/MIME certificates