Merge commit '3fd5ea161e41d94902ef499b41f7032ef07f6430'

diff --combined packages/test-simple/test/test-basic.el
index 27518266753745a9edc6f787bef164e35fb0cd86,f14a385650107f9992df67c089c59dc0a9f4db78..f14a385650107f9992df67c089c59dc0a9f4db78
--- 1/packages/test-simple/test/test-basic.el
--- 2/test/test-basic.el
+++ b/packages/test-simple/test/test-basic.el
@@@ -1,11 -1,6 +1,6 @@@
  ;;; test-simple.el --- Simple Unit Test Framework for Emacs Lisp
  ;; Copyright (C) 2015 Free Software Foundation, Inc
- 
  ;; Author: Rocky Bernstein <rocky@gnu.org>
- ;; URL: http://github.com/rocky/emacs-test-simple
- ;; Keywords: unit-test
- ;; Version: 1.0
- 
  ;; This program is free software: you can redistribute it and/or
  ;; modify it under the terms of the GNU General Public License as
  ;; published by the Free Software Foundation, either version 3 of the

diff --combined packages/test-simple/test/test-fns.el
index be36d4a9592be8fb80ce4bff30e488450a0d8df7,bd340f037141b6bbc15a491df5d9729f9b253d48..bd340f037141b6bbc15a491df5d9729f9b253d48
--- 1/packages/test-simple/test/test-fns.el
--- 2/test/test-fns.el
+++ b/packages/test-simple/test/test-fns.el
@@@ -1,11 -1,6 +1,6 @@@
  ;;; test-simple.el --- Simple Unit Test Framework for Emacs Lisp
  ;; Copyright (C) 2015 Free Software Foundation, Inc
- 
  ;; Author: Rocky Bernstein <rocky@gnu.org>
- ;; URL: http://github.com/rocky/emacs-test-simple
- ;; Keywords: unit-test
- ;; Version: 1.0
- 
  ;; This program is free software: you can redistribute it and/or
  ;; modify it under the terms of the GNU General Public License as
  ;; published by the Free Software Foundation, either version 3 of the

diff --combined packages/test-simple/test/test-no-clear.el
index 34bbbe74e5e8162cf8c13f3d5b9ff974cd350ab7,45822bd9afb6ae3ef964ebe1e5a4bd205ba84331..45822bd9afb6ae3ef964ebe1e5a4bd205ba84331
--- 1/packages/test-simple/test/test-no-clear.el
--- 2/test/test-no-clear.el
+++ b/packages/test-simple/test/test-no-clear.el
@@@ -1,11 -1,6 +1,6 @@@
  ;;; test-simple.el --- Simple Unit Test Framework for Emacs Lisp
  ;; Copyright (C) 2015 Free Software Foundation, Inc
- 
  ;; Author: Rocky Bernstein <rocky@gnu.org>
- ;; URL: http://github.com/rocky/emacs-test-simple
- ;; Keywords: unit-test
- ;; Version: 1.0
- 
  ;; This program is free software: you can redistribute it and/or
  ;; modify it under the terms of the GNU General Public License as
  ;; published by the Free Software Foundation, either version 3 of the