diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8e675c6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+Build.bat
+Build
+_build/
+blib/
+*.tmp
+*.bak
+cover_db/
+MYMETA.yml
+.build
+/Capture-Tiny-*
+/DEBUG
+/_Inline
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..4420629
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+David Golden <dagolden@cpan.org> <dgolden@.(none)>
+David Golden <dagolden@cpan.org> <xdg@xdg.me>
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..7f170c4
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,26 @@
+language: perl
+sudo: false
+perl:
+  - "blead"
+  - "5.24"
+  - "5.22"
+  - "5.20"
+  - "5.18"
+  - "5.16"
+  - "5.14"
+  - "5.12"
+  - "5.10"
+  - "5.8.8"
+matrix:
+  allow_failures:
+    - perl: "blead"
+before_install:
+  - git clone git://github.com/travis-perl/helpers ~/travis-perl-helpers
+  - source ~/travis-perl-helpers/init
+  - build-perl
+  - perl -V
+install:
+  - cpan-install --deps       # installs prereqs, including recommends
+  - cpan-install --coverage   # installs converage prereqs, if enabled
+script: perl Makefile.PL && make test
+# N.B. coverage reporting causes test failures and is omitted
diff --git a/Changes b/Changes
index ed37516..6df0d83 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,12 @@
 Revision history for Capture-Tiny
 
-0.48      2018-04-22 09:01:08+02:00 Europe/Oslo
+{{$NEXT}}
+
+  [Docs]
+
+  - Fixed docs about custom files for capture
+
+0.48      2018-04-22 10:02:47+02:00 Europe/Oslo
 
   - No changes from 0.47-TRIAL
 
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index ff0126d..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,207 +0,0 @@
-This software is Copyright (c) 2009 by David Golden.
-
-This is free software, licensed under:
-
-  The Apache License, Version 2.0, January 2004
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/MANIFEST b/MANIFEST
deleted file mode 100644
index bf5264a..0000000
--- a/MANIFEST
+++ /dev/null
@@ -1,54 +0,0 @@
-# This file was automatically generated by Dist::Zilla::Plugin::Manifest v6.012.
-CONTRIBUTING.mkdn
-Changes
-LICENSE
-MANIFEST
-META.json
-META.yml
-Makefile.PL
-README
-Todo
-cpanfile
-dist.ini
-examples/rt-58208.pl
-examples/tee.pl
-lib/Capture/Tiny.pm
-perlcritic.rc
-t/00-report-prereqs.dd
-t/00-report-prereqs.t
-t/01-Capture-Tiny.t
-t/02-capture.t
-t/03-tee.t
-t/06-stdout-closed.t
-t/07-stderr-closed.t
-t/08-stdin-closed.t
-t/09-preserve-exit-code.t
-t/10-stdout-string.t
-t/11-stderr-string.t
-t/12-stdin-string.t
-t/13-stdout-tied.t
-t/14-stderr-tied.t
-t/15-stdin-tied.t
-t/16-catch-errors.t
-t/17-pass-results.t
-t/18-custom-capture.t
-t/19-relayering.t
-t/20-stdout-badtie.t
-t/21-stderr-badtie.t
-t/22-stdin-badtie.t
-t/23-all-tied.t
-t/24-all-badtied.t
-t/25-cap-fork.t
-t/lib/Cases.pm
-t/lib/TieEvil.pm
-t/lib/TieLC.pm
-t/lib/Utils.pm
-xt/author/00-compile.t
-xt/author/critic.t
-xt/author/minimum-version.t
-xt/author/pod-coverage.t
-xt/author/pod-spell.t
-xt/author/pod-syntax.t
-xt/author/portability.t
-xt/author/test-version.t
-xt/release/distmeta.t
diff --git a/META.json b/META.json
deleted file mode 100644
index 257e4f9..0000000
--- a/META.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-   "abstract" : "Capture STDOUT and STDERR from Perl, XS or external programs",
-   "author" : [
-      "David Golden <dagolden@cpan.org>"
-   ],
-   "dynamic_config" : 1,
-   "generated_by" : "Dist::Zilla version 6.012, CPAN::Meta::Converter version 2.150010",
-   "license" : [
-      "apache_2_0"
-   ],
-   "meta-spec" : {
-      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : 2
-   },
-   "name" : "Capture-Tiny",
-   "no_index" : {
-      "directory" : [
-         "corpus",
-         "examples",
-         "t",
-         "xt"
-      ],
-      "package" : [
-         "DB"
-      ]
-   },
-   "prereqs" : {
-      "configure" : {
-         "requires" : {
-            "ExtUtils::MakeMaker" : "6.17"
-         }
-      },
-      "develop" : {
-         "requires" : {
-            "Dist::Zilla" : "5",
-            "Dist::Zilla::Plugin::OSPrereqs" : "0",
-            "Dist::Zilla::Plugin::Prereqs" : "0",
-            "Dist::Zilla::Plugin::ReleaseStatus::FromVersion" : "0",
-            "Dist::Zilla::Plugin::RemovePrereqs" : "0",
-            "Dist::Zilla::PluginBundle::DAGOLDEN" : "0.072",
-            "File::Spec" : "0",
-            "File::Temp" : "0",
-            "IO::Handle" : "0",
-            "IPC::Open3" : "0",
-            "Pod::Coverage::TrustPod" : "0",
-            "Pod::Wordlist" : "0",
-            "Software::License::Apache_2_0" : "0",
-            "Test::CPAN::Meta" : "0",
-            "Test::MinimumVersion" : "0",
-            "Test::More" : "0",
-            "Test::Perl::Critic" : "0",
-            "Test::Pod" : "1.41",
-            "Test::Pod::Coverage" : "1.08",
-            "Test::Portability::Files" : "0",
-            "Test::Spelling" : "0.12",
-            "Test::Version" : "1"
-         }
-      },
-      "runtime" : {
-         "requires" : {
-            "Carp" : "0",
-            "Exporter" : "0",
-            "File::Spec" : "0",
-            "File::Temp" : "0",
-            "IO::Handle" : "0",
-            "Scalar::Util" : "0",
-            "perl" : "5.006",
-            "strict" : "0",
-            "warnings" : "0"
-         }
-      },
-      "test" : {
-         "recommends" : {
-            "CPAN::Meta" : "2.120900"
-         },
-         "requires" : {
-            "ExtUtils::MakeMaker" : "0",
-            "File::Spec" : "0",
-            "IO::File" : "0",
-            "Test::More" : "0.62",
-            "lib" : "0"
-         }
-      }
-   },
-   "provides" : {
-      "Capture::Tiny" : {
-         "file" : "lib/Capture/Tiny.pm",
-         "version" : "0.48"
-      }
-   },
-   "release_status" : "stable",
-   "resources" : {
-      "bugtracker" : {
-         "web" : "https://github.com/dagolden/Capture-Tiny/issues"
-      },
-      "homepage" : "https://github.com/dagolden/Capture-Tiny",
-      "repository" : {
-         "type" : "git",
-         "url" : "https://github.com/dagolden/Capture-Tiny.git",
-         "web" : "https://github.com/dagolden/Capture-Tiny"
-      }
-   },
-   "version" : "0.48",
-   "x_authority" : "cpan:DAGOLDEN",
-   "x_contributors" : [
-      "Dagfinn Ilmari Manns\u00e5ker <ilmari@ilmari.org>",
-      "David E. Wheeler <david@justatheory.com>",
-      "fecundf <not.com+github@gmail.com>",
-      "Graham Knop <haarg@haarg.org>",
-      "Peter Rabbitson <ribasushi@cpan.org>"
-   ],
-   "x_generated_by_perl" : "v5.26.1",
-   "x_serialization_backend" : "Cpanel::JSON::XS version 3.0239"
-}
-
diff --git a/META.yml b/META.yml
deleted file mode 100644
index 8007bf0..0000000
--- a/META.yml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-abstract: 'Capture STDOUT and STDERR from Perl, XS or external programs'
-author:
-  - 'David Golden <dagolden@cpan.org>'
-build_requires:
-  ExtUtils::MakeMaker: '0'
-  File::Spec: '0'
-  IO::File: '0'
-  Test::More: '0.62'
-  lib: '0'
-configure_requires:
-  ExtUtils::MakeMaker: '6.17'
-dynamic_config: 1
-generated_by: 'Dist::Zilla version 6.012, CPAN::Meta::Converter version 2.150010'
-license: apache
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: '1.4'
-name: Capture-Tiny
-no_index:
-  directory:
-    - corpus
-    - examples
-    - t
-    - xt
-  package:
-    - DB
-provides:
-  Capture::Tiny:
-    file: lib/Capture/Tiny.pm
-    version: '0.48'
-requires:
-  Carp: '0'
-  Exporter: '0'
-  File::Spec: '0'
-  File::Temp: '0'
-  IO::Handle: '0'
-  Scalar::Util: '0'
-  perl: '5.006'
-  strict: '0'
-  warnings: '0'
-resources:
-  bugtracker: https://github.com/dagolden/Capture-Tiny/issues
-  homepage: https://github.com/dagolden/Capture-Tiny
-  repository: https://github.com/dagolden/Capture-Tiny.git
-version: '0.48'
-x_authority: cpan:DAGOLDEN
-x_contributors:
-  - 'Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>'
-  - 'David E. Wheeler <david@justatheory.com>'
-  - 'fecundf <not.com+github@gmail.com>'
-  - 'Graham Knop <haarg@haarg.org>'
-  - 'Peter Rabbitson <ribasushi@cpan.org>'
-x_generated_by_perl: v5.26.1
-x_serialization_backend: 'YAML::Tiny version 1.70'
diff --git a/Makefile.PL b/Makefile.PL
index 04669d3..b265068 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,4 +1,3 @@
-# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker v6.012.
 use strict;
 use warnings;
 
@@ -33,7 +32,7 @@ my %WriteMakefileArgs = (
     "Test::More" => "0.62",
     "lib" => 0
   },
-  "VERSION" => "0.48",
+  "VERSION" => "0.49",
   "test" => {
     "TESTS" => "t/*.t"
   }
diff --git a/README b/README
deleted file mode 100644
index 8b58130..0000000
--- a/README
+++ /dev/null
@@ -1,375 +0,0 @@
-NAME
-    Capture::Tiny - Capture STDOUT and STDERR from Perl, XS or external
-    programs
-
-VERSION
-    version 0.48
-
-SYNOPSIS
-      use Capture::Tiny ':all';
-
-      # capture from external command
-
-      ($stdout, $stderr, $exit) = capture {
-        system( $cmd, @args );
-      };
-
-      # capture from arbitrary code (Perl or external)
-
-      ($stdout, $stderr, @result) = capture {
-        # your code here
-      };
-
-      # capture partial or merged output
-
-      $stdout = capture_stdout { ... };
-      $stderr = capture_stderr { ... };
-      $merged = capture_merged { ... };
-
-      # tee output
-
-      ($stdout, $stderr) = tee {
-        # your code here
-      };
-
-      $stdout = tee_stdout { ... };
-      $stderr = tee_stderr { ... };
-      $merged = tee_merged { ... };
-
-DESCRIPTION
-    Capture::Tiny provides a simple, portable way to capture almost anything
-    sent to STDOUT or STDERR, regardless of whether it comes from Perl, from
-    XS code or from an external program. Optionally, output can be teed so
-    that it is captured while being passed through to the original
-    filehandles. Yes, it even works on Windows (usually). Stop guessing
-    which of a dozen capturing modules to use in any particular situation
-    and just use this one.
-
-USAGE
-    The following functions are available. None are exported by default.
-
-  capture
-      ($stdout, $stderr, @result) = capture \&code;
-      $stdout = capture \&code;
-
-    The "capture" function takes a code reference and returns what is sent
-    to STDOUT and STDERR as well as any return values from the code
-    reference. In scalar context, it returns only STDOUT. If no output was
-    received for a filehandle, it returns an empty string for that
-    filehandle. Regardless of calling context, all output is captured --
-    nothing is passed to the existing filehandles.
-
-    It is prototyped to take a subroutine reference as an argument. Thus, it
-    can be called in block form:
-
-      ($stdout, $stderr) = capture {
-        # your code here ...
-      };
-
-    Note that the coderef is evaluated in list context. If you wish to force
-    scalar context on the return value, you must use the "scalar" keyword.
-
-      ($stdout, $stderr, $count) = capture {
-        my @list = qw/one two three/;
-        return scalar @list; # $count will be 3
-      };
-
-    Also note that within the coderef, the @_ variable will be empty. So
-    don't use arguments from a surrounding subroutine without copying them
-    to an array first:
-
-      sub wont_work {
-        my ($stdout, $stderr) = capture { do_stuff( @_ ) };    # WRONG
-        ...
-      }
-
-      sub will_work {
-        my @args = @_;
-        my ($stdout, $stderr) = capture { do_stuff( @args ) }; # RIGHT
-        ...
-      }
-
-    Captures are normally done to an anonymous temporary filehandle. To
-    capture via a named file (e.g. to externally monitor a long-running
-    capture), provide custom filehandles as a trailing list of option pairs:
-
-      my $out_fh = IO::File->new("out.txt", "w+");
-      my $err_fh = IO::File->new("out.txt", "w+");
-      capture { ... } stdout => $out_fh, stderr => $err_fh;
-
-    The filehandles must be read/write and seekable. Modifying the files or
-    filehandles during a capture operation will give unpredictable results.
-    Existing IO layers on them may be changed by the capture.
-
-    When called in void context, "capture" saves memory and time by not
-    reading back from the capture handles.
-
-  capture_stdout
-      ($stdout, @result) = capture_stdout \&code;
-      $stdout = capture_stdout \&code;
-
-    The "capture_stdout" function works just like "capture" except only
-    STDOUT is captured. STDERR is not captured.
-
-  capture_stderr
-      ($stderr, @result) = capture_stderr \&code;
-      $stderr = capture_stderr \&code;
-
-    The "capture_stderr" function works just like "capture" except only
-    STDERR is captured. STDOUT is not captured.
-
-  capture_merged
-      ($merged, @result) = capture_merged \&code;
-      $merged = capture_merged \&code;
-
-    The "capture_merged" function works just like "capture" except STDOUT
-    and STDERR are merged. (Technically, STDERR is redirected to the same
-    capturing handle as STDOUT before executing the function.)
-
-    Caution: STDOUT and STDERR output in the merged result are not
-    guaranteed to be properly ordered due to buffering.
-
-  tee
-      ($stdout, $stderr, @result) = tee \&code;
-      $stdout = tee \&code;
-
-    The "tee" function works just like "capture", except that output is
-    captured as well as passed on to the original STDOUT and STDERR.
-
-    When called in void context, "tee" saves memory and time by not reading
-    back from the capture handles, except when the original STDOUT OR STDERR
-    were tied or opened to a scalar handle.
-
-  tee_stdout
-      ($stdout, @result) = tee_stdout \&code;
-      $stdout = tee_stdout \&code;
-
-    The "tee_stdout" function works just like "tee" except only STDOUT is
-    teed. STDERR is not teed (output goes to STDERR as usual).
-
-  tee_stderr
-      ($stderr, @result) = tee_stderr \&code;
-      $stderr = tee_stderr \&code;
-
-    The "tee_stderr" function works just like "tee" except only STDERR is
-    teed. STDOUT is not teed (output goes to STDOUT as usual).
-
-  tee_merged
-      ($merged, @result) = tee_merged \&code;
-      $merged = tee_merged \&code;
-
-    The "tee_merged" function works just like "capture_merged" except that
-    output is captured as well as passed on to STDOUT.
-
-    Caution: STDOUT and STDERR output in the merged result are not
-    guaranteed to be properly ordered due to buffering.
-
-LIMITATIONS
-  Portability
-    Portability is a goal, not a guarantee. "tee" requires fork, except on
-    Windows where "system(1, @cmd)" is used instead. Not tested on any
-    particularly esoteric platforms yet. See the CPAN Testers Matrix
-    <http://matrix.cpantesters.org/?dist=Capture-Tiny> for test result by
-    platform.
-
-  PerlIO layers
-    Capture::Tiny does its best to preserve PerlIO layers such as ':utf8' or
-    ':crlf' when capturing (only for Perl 5.8.1+) . Layers should be applied
-    to STDOUT or STDERR *before* the call to "capture" or "tee". This may
-    not work for tied filehandles (see below).
-
-  Modifying filehandles before capturing
-    Generally speaking, you should do little or no manipulation of the
-    standard IO filehandles prior to using Capture::Tiny. In particular,
-    closing, reopening, localizing or tying standard filehandles prior to
-    capture may cause a variety of unexpected, undesirable and/or unreliable
-    behaviors, as described below. Capture::Tiny does its best to compensate
-    for these situations, but the results may not be what you desire.
-
-   Closed filehandles
-    Capture::Tiny will work even if STDIN, STDOUT or STDERR have been
-    previously closed. However, since they will be reopened to capture or
-    tee output, any code within the captured block that depends on finding
-    them closed will, of course, not find them to be closed. If they started
-    closed, Capture::Tiny will close them again when the capture block
-    finishes.
-
-    Note that this reopening will happen even for STDIN or a filehandle not
-    being captured to ensure that the filehandle used for capture is not
-    opened to file descriptor 0, as this causes problems on various
-    platforms.
-
-    Prior to Perl 5.12, closed STDIN combined with PERL_UNICODE=D leaks
-    filehandles and also breaks tee() for undiagnosed reasons. So don't do
-    that.
-
-   Localized filehandles
-    If code localizes any of Perl's standard filehandles before capturing,
-    the capture will affect the localized filehandles and not the original
-    ones. External system calls are not affected by localizing a filehandle
-    in Perl and will continue to send output to the original filehandles
-    (which will thus not be captured).
-
-   Scalar filehandles
-    If STDOUT or STDERR are reopened to scalar filehandles prior to the call
-    to "capture" or "tee", then Capture::Tiny will override the output
-    filehandle for the duration of the "capture" or "tee" call and then, for
-    "tee", send captured output to the output filehandle after the capture
-    is complete. (Requires Perl 5.8)
-
-    Capture::Tiny attempts to preserve the semantics of STDIN opened to a
-    scalar reference, but note that external processes will not be able to
-    read from such a handle. Capture::Tiny tries to ensure that external
-    processes will read from the null device instead, but this is not
-    guaranteed.
-
-   Tied output filehandles
-    If STDOUT or STDERR are tied prior to the call to "capture" or "tee",
-    then Capture::Tiny will attempt to override the tie for the duration of
-    the "capture" or "tee" call and then send captured output to the tied
-    filehandle after the capture is complete. (Requires Perl 5.8)
-
-    Capture::Tiny may not succeed resending UTF-8 encoded data to a tied
-    STDOUT or STDERR filehandle. Characters may appear as bytes. If the tied
-    filehandle is based on Tie::StdHandle, then Capture::Tiny will attempt
-    to determine appropriate layers like ":utf8" from the underlying
-    filehandle and do the right thing.
-
-   Tied input filehandle
-    Capture::Tiny attempts to preserve the semantics of tied STDIN, but this
-    requires Perl 5.8 and is not entirely predictable. External processes
-    will not be able to read from such a handle.
-
-    Unless having STDIN tied is crucial, it may be safest to localize STDIN
-    when capturing:
-
-      my ($out, $err) = do { local *STDIN; capture { ... } };
-
-  Modifying filehandles during a capture
-    Attempting to modify STDIN, STDOUT or STDERR *during* "capture" or "tee"
-    is almost certainly going to cause problems. Don't do that.
-
-   Forking inside a capture
-    Forks aren't portable. The behavior of filehandles during a fork is even
-    less so. If Capture::Tiny detects that a fork has occurred within a
-    capture, it will shortcut in the child process and return empty strings
-    for captures. Other problems may occur in the child or parent, as well.
-    Forking in a capture block is not recommended.
-
-   Using threads
-    Filehandles are global. Mixing up I/O and captures in different threads
-    without coordination is going to cause problems. Besides, threads are
-    officially discouraged.
-
-   Dropping privileges during a capture
-    If you drop privileges during a capture, temporary files created to
-    facilitate the capture may not be cleaned up afterwards.
-
-  No support for Perl 5.8.0
-    It's just too buggy when it comes to layers and UTF-8. Perl 5.8.1 or
-    later is recommended.
-
-  Limited support for Perl 5.6
-    Perl 5.6 predates PerlIO. UTF-8 data may not be captured correctly.
-
-ENVIRONMENT
-  PERL_CAPTURE_TINY_TIMEOUT
-    Capture::Tiny uses subprocesses internally for "tee". By default,
-    Capture::Tiny will timeout with an error if such subprocesses are not
-    ready to receive data within 30 seconds (or whatever is the value of
-    $Capture::Tiny::TIMEOUT). An alternate timeout may be specified by
-    setting the "PERL_CAPTURE_TINY_TIMEOUT" environment variable. Setting it
-    to zero will disable timeouts. NOTE, this does not timeout the code
-    reference being captured -- this only prevents Capture::Tiny itself from
-    hanging your process waiting for its child processes to be ready to
-    proceed.
-
-SEE ALSO
-    This module was inspired by IO::CaptureOutput, which provides similar
-    functionality without the ability to tee output and with more
-    complicated code and API. IO::CaptureOutput does not handle layers or
-    most of the unusual cases described in the "Limitations" section and I
-    no longer recommend it.
-
-    There are many other CPAN modules that provide some sort of output
-    capture, albeit with various limitations that make them appropriate only
-    in particular circumstances. I'm probably missing some. The long list is
-    provided to show why I felt Capture::Tiny was necessary.
-
-    *   IO::Capture
-
-    *   IO::Capture::Extended
-
-    *   IO::CaptureOutput
-
-    *   IPC::Capture
-
-    *   IPC::Cmd
-
-    *   IPC::Open2
-
-    *   IPC::Open3
-
-    *   IPC::Open3::Simple
-
-    *   IPC::Open3::Utils
-
-    *   IPC::Run
-
-    *   IPC::Run::SafeHandles
-
-    *   IPC::Run::Simple
-
-    *   IPC::Run3
-
-    *   IPC::System::Simple
-
-    *   Tee
-
-    *   IO::Tee
-
-    *   File::Tee
-
-    *   Filter::Handle
-
-    *   Tie::STDERR
-
-    *   Tie::STDOUT
-
-    *   Test::Output
-
-SUPPORT
-  Bugs / Feature Requests
-    Please report any bugs or feature requests through the issue tracker at
-    <https://github.com/dagolden/Capture-Tiny/issues>. You will be notified
-    automatically of any progress on your issue.
-
-  Source Code
-    This is open source software. The code repository is available for
-    public review and contribution under the terms of the license.
-
-    <https://github.com/dagolden/Capture-Tiny>
-
-      git clone https://github.com/dagolden/Capture-Tiny.git
-
-AUTHOR
-    David Golden <dagolden@cpan.org>
-
-CONTRIBUTORS
-    *   Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
-
-    *   David E. Wheeler <david@justatheory.com>
-
-    *   fecundf <not.com+github@gmail.com>
-
-    *   Graham Knop <haarg@haarg.org>
-
-    *   Peter Rabbitson <ribasushi@cpan.org>
-
-COPYRIGHT AND LICENSE
-    This software is Copyright (c) 2009 by David Golden.
-
-    This is free software, licensed under:
-
-      The Apache License, Version 2.0, January 2004
-
diff --git a/README.mkdn b/README.mkdn
new file mode 120000
index 0000000..0b0ab43
--- /dev/null
+++ b/README.mkdn
@@ -0,0 +1 @@
+CONTRIBUTING.mkdn
\ No newline at end of file
diff --git a/cpanfile b/cpanfile
deleted file mode 100644
index 3d5be8d..0000000
--- a/cpanfile
+++ /dev/null
@@ -1,50 +0,0 @@
-requires "Carp" => "0";
-requires "Exporter" => "0";
-requires "File::Spec" => "0";
-requires "File::Temp" => "0";
-requires "IO::Handle" => "0";
-requires "Scalar::Util" => "0";
-requires "perl" => "5.006";
-requires "strict" => "0";
-requires "warnings" => "0";
-
-on 'test' => sub {
-  requires "ExtUtils::MakeMaker" => "0";
-  requires "File::Spec" => "0";
-  requires "IO::File" => "0";
-  requires "Test::More" => "0.62";
-  requires "lib" => "0";
-};
-
-on 'test' => sub {
-  recommends "CPAN::Meta" => "2.120900";
-};
-
-on 'configure' => sub {
-  requires "ExtUtils::MakeMaker" => "6.17";
-};
-
-on 'develop' => sub {
-  requires "Dist::Zilla" => "5";
-  requires "Dist::Zilla::Plugin::OSPrereqs" => "0";
-  requires "Dist::Zilla::Plugin::Prereqs" => "0";
-  requires "Dist::Zilla::Plugin::ReleaseStatus::FromVersion" => "0";
-  requires "Dist::Zilla::Plugin::RemovePrereqs" => "0";
-  requires "Dist::Zilla::PluginBundle::DAGOLDEN" => "0.072";
-  requires "File::Spec" => "0";
-  requires "File::Temp" => "0";
-  requires "IO::Handle" => "0";
-  requires "IPC::Open3" => "0";
-  requires "Pod::Coverage::TrustPod" => "0";
-  requires "Pod::Wordlist" => "0";
-  requires "Software::License::Apache_2_0" => "0";
-  requires "Test::CPAN::Meta" => "0";
-  requires "Test::MinimumVersion" => "0";
-  requires "Test::More" => "0";
-  requires "Test::Perl::Critic" => "0";
-  requires "Test::Pod" => "1.41";
-  requires "Test::Pod::Coverage" => "1.08";
-  requires "Test::Portability::Files" => "0";
-  requires "Test::Spelling" => "0.12";
-  requires "Test::Version" => "1";
-};
diff --git a/debian/changelog b/debian/changelog
index eed892f..0714e36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcapture-tiny-perl (0.48+git20180703.552edbf-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Tue, 23 Jul 2019 09:37:52 +0000
+
 libcapture-tiny-perl (0.48-1) unstable; urgency=medium
 
   [ Alex Muntada ]
diff --git a/lib/Capture/Tiny.pm b/lib/Capture/Tiny.pm
index 2a5af95..9031c7f 100644
--- a/lib/Capture/Tiny.pm
+++ b/lib/Capture/Tiny.pm
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 package Capture::Tiny;
 # ABSTRACT: Capture STDOUT and STDERR from Perl, XS or external programs
-our $VERSION = '0.48';
+our $VERSION = '0.49';
 use Carp ();
 use Exporter ();
 use IO::Handle ();
@@ -428,16 +428,6 @@ __END__
 
 =pod
 
-=encoding UTF-8
-
-=head1 NAME
-
-Capture::Tiny - Capture STDOUT and STDERR from Perl, XS or external programs
-
-=head1 VERSION
-
-version 0.48
-
 =head1 SYNOPSIS
 
   use Capture::Tiny ':all';
@@ -529,7 +519,7 @@ capture via a named file (e.g. to externally monitor a long-running capture),
 provide custom filehandles as a trailing list of option pairs:
 
   my $out_fh = IO::File->new("out.txt", "w+");
-  my $err_fh = IO::File->new("out.txt", "w+");
+  my $err_fh = IO::File->new("err.txt", "w+");
   capture { ... } stdout => $out_fh, stderr => $err_fh;
 
 The filehandles must be read/write and seekable.  Modifying the files or
@@ -751,151 +741,28 @@ albeit with various limitations that make them appropriate only in particular
 circumstances.  I'm probably missing some.  The long list is provided to show
 why I felt Capture::Tiny was necessary.
 
-=over 4
-
-=item *
-
-L<IO::Capture>
-
-=item *
-
-L<IO::Capture::Extended>
-
-=item *
-
-L<IO::CaptureOutput>
-
-=item *
-
-L<IPC::Capture>
-
-=item *
-
-L<IPC::Cmd>
-
-=item *
-
-L<IPC::Open2>
-
-=item *
-
-L<IPC::Open3>
-
-=item *
-
-L<IPC::Open3::Simple>
-
-=item *
-
-L<IPC::Open3::Utils>
-
-=item *
-
-L<IPC::Run>
-
-=item *
-
-L<IPC::Run::SafeHandles>
-
-=item *
-
-L<IPC::Run::Simple>
-
-=item *
-
-L<IPC::Run3>
-
-=item *
-
-L<IPC::System::Simple>
-
-=item *
-
-L<Tee>
-
-=item *
-
-L<IO::Tee>
-
-=item *
-
-L<File::Tee>
-
-=item *
-
-L<Filter::Handle>
-
-=item *
-
-L<Tie::STDERR>
-
-=item *
-
-L<Tie::STDOUT>
-
-=item *
-
-L<Test::Output>
-
-=back
-
-=for :stopwords cpan testmatrix url annocpan anno bugtracker rt cpants kwalitee diff irc mailto metadata placeholders metacpan
-
-=head1 SUPPORT
-
-=head2 Bugs / Feature Requests
-
-Please report any bugs or feature requests through the issue tracker
-at L<https://github.com/dagolden/Capture-Tiny/issues>.
-You will be notified automatically of any progress on your issue.
-
-=head2 Source Code
-
-This is open source software.  The code repository is available for
-public review and contribution under the terms of the license.
-
-L<https://github.com/dagolden/Capture-Tiny>
-
-  git clone https://github.com/dagolden/Capture-Tiny.git
-
-=head1 AUTHOR
-
-David Golden <dagolden@cpan.org>
-
-=head1 CONTRIBUTORS
-
-=for stopwords Dagfinn Ilmari Mannsåker David E. Wheeler fecundf Graham Knop Peter Rabbitson
-
-=over 4
-
-=item *
-
-Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
-
-=item *
-
-David E. Wheeler <david@justatheory.com>
-
-=item *
-
-fecundf <not.com+github@gmail.com>
-
-=item *
-
-Graham Knop <haarg@haarg.org>
-
-=item *
-
-Peter Rabbitson <ribasushi@cpan.org>
-
-=back
-
-=head1 COPYRIGHT AND LICENSE
-
-This software is Copyright (c) 2009 by David Golden.
-
-This is free software, licensed under:
-
-  The Apache License, Version 2.0, January 2004
+=for :list
+* L<IO::Capture>
+* L<IO::Capture::Extended>
+* L<IO::CaptureOutput>
+* L<IPC::Capture>
+* L<IPC::Cmd>
+* L<IPC::Open2>
+* L<IPC::Open3>
+* L<IPC::Open3::Simple>
+* L<IPC::Open3::Utils>
+* L<IPC::Run>
+* L<IPC::Run::SafeHandles>
+* L<IPC::Run::Simple>
+* L<IPC::Run3>
+* L<IPC::System::Simple>
+* L<Tee>
+* L<IO::Tee>
+* L<File::Tee>
+* L<Filter::Handle>
+* L<Tie::STDERR>
+* L<Tie::STDOUT>
+* L<Test::Output>
 
 =cut
+
diff --git a/t/00-report-prereqs.dd b/t/00-report-prereqs.dd
deleted file mode 100644
index 3a4465a..0000000
--- a/t/00-report-prereqs.dd
+++ /dev/null
@@ -1,60 +0,0 @@
-do { my $x = {
-       'configure' => {
-                        'requires' => {
-                                        'ExtUtils::MakeMaker' => '6.17'
-                                      }
-                      },
-       'develop' => {
-                      'requires' => {
-                                      'Dist::Zilla' => '5',
-                                      'Dist::Zilla::Plugin::OSPrereqs' => '0',
-                                      'Dist::Zilla::Plugin::Prereqs' => '0',
-                                      'Dist::Zilla::Plugin::ReleaseStatus::FromVersion' => '0',
-                                      'Dist::Zilla::Plugin::RemovePrereqs' => '0',
-                                      'Dist::Zilla::PluginBundle::DAGOLDEN' => '0.072',
-                                      'File::Spec' => '0',
-                                      'File::Temp' => '0',
-                                      'IO::Handle' => '0',
-                                      'IPC::Open3' => '0',
-                                      'Pod::Coverage::TrustPod' => '0',
-                                      'Pod::Wordlist' => '0',
-                                      'Software::License::Apache_2_0' => '0',
-                                      'Test::CPAN::Meta' => '0',
-                                      'Test::MinimumVersion' => '0',
-                                      'Test::More' => '0',
-                                      'Test::Perl::Critic' => '0',
-                                      'Test::Pod' => '1.41',
-                                      'Test::Pod::Coverage' => '1.08',
-                                      'Test::Portability::Files' => '0',
-                                      'Test::Spelling' => '0.12',
-                                      'Test::Version' => '1'
-                                    }
-                    },
-       'runtime' => {
-                      'requires' => {
-                                      'Carp' => '0',
-                                      'Exporter' => '0',
-                                      'File::Spec' => '0',
-                                      'File::Temp' => '0',
-                                      'IO::Handle' => '0',
-                                      'Scalar::Util' => '0',
-                                      'perl' => '5.006',
-                                      'strict' => '0',
-                                      'warnings' => '0'
-                                    }
-                    },
-       'test' => {
-                   'recommends' => {
-                                     'CPAN::Meta' => '2.120900'
-                                   },
-                   'requires' => {
-                                   'ExtUtils::MakeMaker' => '0',
-                                   'File::Spec' => '0',
-                                   'IO::File' => '0',
-                                   'Test::More' => '0.62',
-                                   'lib' => '0'
-                                 }
-                 }
-     };
-  $x;
- }
\ No newline at end of file
diff --git a/t/00-report-prereqs.t b/t/00-report-prereqs.t
deleted file mode 100644
index c72183a..0000000
--- a/t/00-report-prereqs.t
+++ /dev/null
@@ -1,193 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-# This test was generated by Dist::Zilla::Plugin::Test::ReportPrereqs 0.027
-
-use Test::More tests => 1;
-
-use ExtUtils::MakeMaker;
-use File::Spec;
-
-# from $version::LAX
-my $lax_version_re =
-    qr/(?: undef | (?: (?:[0-9]+) (?: \. | (?:\.[0-9]+) (?:_[0-9]+)? )?
-            |
-            (?:\.[0-9]+) (?:_[0-9]+)?
-        ) | (?:
-            v (?:[0-9]+) (?: (?:\.[0-9]+)+ (?:_[0-9]+)? )?
-            |
-            (?:[0-9]+)? (?:\.[0-9]+){2,} (?:_[0-9]+)?
-        )
-    )/x;
-
-# hide optional CPAN::Meta modules from prereq scanner
-# and check if they are available
-my $cpan_meta = "CPAN::Meta";
-my $cpan_meta_pre = "CPAN::Meta::Prereqs";
-my $HAS_CPAN_META = eval "require $cpan_meta; $cpan_meta->VERSION('2.120900')" && eval "require $cpan_meta_pre"; ## no critic
-
-# Verify requirements?
-my $DO_VERIFY_PREREQS = 1;
-
-sub _max {
-    my $max = shift;
-    $max = ( $_ > $max ) ? $_ : $max for @_;
-    return $max;
-}
-
-sub _merge_prereqs {
-    my ($collector, $prereqs) = @_;
-
-    # CPAN::Meta::Prereqs object
-    if (ref $collector eq $cpan_meta_pre) {
-        return $collector->with_merged_prereqs(
-            CPAN::Meta::Prereqs->new( $prereqs )
-        );
-    }
-
-    # Raw hashrefs
-    for my $phase ( keys %$prereqs ) {
-        for my $type ( keys %{ $prereqs->{$phase} } ) {
-            for my $module ( keys %{ $prereqs->{$phase}{$type} } ) {
-                $collector->{$phase}{$type}{$module} = $prereqs->{$phase}{$type}{$module};
-            }
-        }
-    }
-
-    return $collector;
-}
-
-my @include = qw(
-
-);
-
-my @exclude = qw(
-
-);
-
-# Add static prereqs to the included modules list
-my $static_prereqs = do './t/00-report-prereqs.dd';
-
-# Merge all prereqs (either with ::Prereqs or a hashref)
-my $full_prereqs = _merge_prereqs(
-    ( $HAS_CPAN_META ? $cpan_meta_pre->new : {} ),
-    $static_prereqs
-);
-
-# Add dynamic prereqs to the included modules list (if we can)
-my ($source) = grep { -f } 'MYMETA.json', 'MYMETA.yml';
-my $cpan_meta_error;
-if ( $source && $HAS_CPAN_META
-    && (my $meta = eval { CPAN::Meta->load_file($source) } )
-) {
-    $full_prereqs = _merge_prereqs($full_prereqs, $meta->prereqs);
-}
-else {
-    $cpan_meta_error = $@;    # capture error from CPAN::Meta->load_file($source)
-    $source = 'static metadata';
-}
-
-my @full_reports;
-my @dep_errors;
-my $req_hash = $HAS_CPAN_META ? $full_prereqs->as_string_hash : $full_prereqs;
-
-# Add static includes into a fake section
-for my $mod (@include) {
-    $req_hash->{other}{modules}{$mod} = 0;
-}
-
-for my $phase ( qw(configure build test runtime develop other) ) {
-    next unless $req_hash->{$phase};
-    next if ($phase eq 'develop' and not $ENV{AUTHOR_TESTING});
-
-    for my $type ( qw(requires recommends suggests conflicts modules) ) {
-        next unless $req_hash->{$phase}{$type};
-
-        my $title = ucfirst($phase).' '.ucfirst($type);
-        my @reports = [qw/Module Want Have/];
-
-        for my $mod ( sort keys %{ $req_hash->{$phase}{$type} } ) {
-            next if $mod eq 'perl';
-            next if grep { $_ eq $mod } @exclude;
-
-            my $file = $mod;
-            $file =~ s{::}{/}g;
-            $file .= ".pm";
-            my ($prefix) = grep { -e File::Spec->catfile($_, $file) } @INC;
-
-            my $want = $req_hash->{$phase}{$type}{$mod};
-            $want = "undef" unless defined $want;
-            $want = "any" if !$want && $want == 0;
-
-            my $req_string = $want eq 'any' ? 'any version required' : "version '$want' required";
-
-            if ($prefix) {
-                my $have = MM->parse_version( File::Spec->catfile($prefix, $file) );
-                $have = "undef" unless defined $have;
-                push @reports, [$mod, $want, $have];
-
-                if ( $DO_VERIFY_PREREQS && $HAS_CPAN_META && $type eq 'requires' ) {
-                    if ( $have !~ /\A$lax_version_re\z/ ) {
-                        push @dep_errors, "$mod version '$have' cannot be parsed ($req_string)";
-                    }
-                    elsif ( ! $full_prereqs->requirements_for( $phase, $type )->accepts_module( $mod => $have ) ) {
-                        push @dep_errors, "$mod version '$have' is not in required range '$want'";
-                    }
-                }
-            }
-            else {
-                push @reports, [$mod, $want, "missing"];
-
-                if ( $DO_VERIFY_PREREQS && $type eq 'requires' ) {
-                    push @dep_errors, "$mod is not installed ($req_string)";
-                }
-            }
-        }
-
-        if ( @reports ) {
-            push @full_reports, "=== $title ===\n\n";
-
-            my $ml = _max( map { length $_->[0] } @reports );
-            my $wl = _max( map { length $_->[1] } @reports );
-            my $hl = _max( map { length $_->[2] } @reports );
-
-            if ($type eq 'modules') {
-                splice @reports, 1, 0, ["-" x $ml, "", "-" x $hl];
-                push @full_reports, map { sprintf("    %*s %*s\n", -$ml, $_->[0], $hl, $_->[2]) } @reports;
-            }
-            else {
-                splice @reports, 1, 0, ["-" x $ml, "-" x $wl, "-" x $hl];
-                push @full_reports, map { sprintf("    %*s %*s %*s\n", -$ml, $_->[0], $wl, $_->[1], $hl, $_->[2]) } @reports;
-            }
-
-            push @full_reports, "\n";
-        }
-    }
-}
-
-if ( @full_reports ) {
-    diag "\nVersions for all modules listed in $source (including optional ones):\n\n", @full_reports;
-}
-
-if ( $cpan_meta_error || @dep_errors ) {
-    diag "\n*** WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING ***\n";
-}
-
-if ( $cpan_meta_error ) {
-    my ($orig_source) = grep { -f } 'MYMETA.json', 'MYMETA.yml';
-    diag "\nCPAN::Meta->load_file('$orig_source') failed with: $cpan_meta_error\n";
-}
-
-if ( @dep_errors ) {
-    diag join("\n",
-        "\nThe following REQUIRED prerequisites were not satisfied:\n",
-        @dep_errors,
-        "\n"
-    );
-}
-
-pass;
-
-# vim: ts=4 sts=4 sw=4 et:
diff --git a/xt/author/00-compile.t b/xt/author/00-compile.t
deleted file mode 100644
index 6404e65..0000000
--- a/xt/author/00-compile.t
+++ /dev/null
@@ -1,63 +0,0 @@
-use 5.006;
-use strict;
-use warnings;
-
-# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.058
-
-use Test::More;
-
-plan tests => 2;
-
-my @module_files = (
-    'Capture/Tiny.pm'
-);
-
-
-
-# fake home for cpan-testers
-use File::Temp;
-local $ENV{HOME} = File::Temp::tempdir( CLEANUP => 1 );
-
-
-my @switches = (
-    -d 'blib' ? '-Mblib' : '-Ilib',
-);
-
-use File::Spec;
-use IPC::Open3;
-use IO::Handle;
-
-open my $stdin, '<', File::Spec->devnull or die "can't open devnull: $!";
-
-my @warnings;
-for my $lib (@module_files)
-{
-    # see L<perlfaq8/How can I capture STDERR from an external command?>
-    my $stderr = IO::Handle->new;
-
-    diag('Running: ', join(', ', map { my $str = $_; $str =~ s/'/\\'/g; q{'} . $str . q{'} }
-            $^X, @switches, '-e', "require q[$lib]"))
-        if $ENV{PERL_COMPILE_TEST_DEBUG};
-
-    my $pid = open3($stdin, '>&STDERR', $stderr, $^X, @switches, '-e', "require q[$lib]");
-    binmode $stderr, ':crlf' if $^O eq 'MSWin32';
-    my @_warnings = <$stderr>;
-    waitpid($pid, 0);
-    is($?, 0, "$lib loaded ok");
-
-    shift @_warnings if @_warnings and $_warnings[0] =~ /^Using .*\bblib/
-        and not eval { +require blib; blib->VERSION('1.01') };
-
-    if (@_warnings)
-    {
-        warn @_warnings;
-        push @warnings, @_warnings;
-    }
-}
-
-
-
-is(scalar(@warnings), 0, 'no warnings found')
-    or diag 'got warnings: ', ( Test::More->can('explain') ? Test::More::explain(\@warnings) : join("\n", '', @warnings) );
-
-
diff --git a/xt/author/critic.t b/xt/author/critic.t
deleted file mode 100644
index 80ccdad..0000000
--- a/xt/author/critic.t
+++ /dev/null
@@ -1,7 +0,0 @@
-#!perl
-
-use strict;
-use warnings;
-
-use Test::Perl::Critic (-profile => "perlcritic.rc") x!! -e "perlcritic.rc";
-all_critic_ok();
diff --git a/xt/author/minimum-version.t b/xt/author/minimum-version.t
deleted file mode 100644
index d4a20c3..0000000
--- a/xt/author/minimum-version.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!perl
-
-use Test::More;
-
-use Test::MinimumVersion;
-all_minimum_version_ok( qq{5.010} );
diff --git a/xt/author/pod-coverage.t b/xt/author/pod-coverage.t
deleted file mode 100644
index 66b3b64..0000000
--- a/xt/author/pod-coverage.t
+++ /dev/null
@@ -1,7 +0,0 @@
-#!perl
-# This file was automatically generated by Dist::Zilla::Plugin::PodCoverageTests.
-
-use Test::Pod::Coverage 1.08;
-use Pod::Coverage::TrustPod;
-
-all_pod_coverage_ok({ coverage_class => 'Pod::Coverage::TrustPod' });
diff --git a/xt/author/pod-spell.t b/xt/author/pod-spell.t
deleted file mode 100644
index e98b029..0000000
--- a/xt/author/pod-spell.t
+++ /dev/null
@@ -1,37 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.007005
-use Test::Spelling 0.12;
-use Pod::Wordlist;
-
-
-add_stopwords(<DATA>);
-all_pod_files_spelling_ok( qw( bin lib ) );
-__DATA__
-Capture
-Dagfinn
-David
-Golden
-Graham
-Ilmari
-Knop
-Mannsåker
-Peter
-Rabbitson
-Tiny
-UTF
-Wheeler
-dagolden
-david
-fecundf
-haarg
-ilmari
-lib
-not
-prototyped
-resending
-ribasushi
-seekable
-undiagnosed
diff --git a/xt/author/pod-syntax.t b/xt/author/pod-syntax.t
deleted file mode 100644
index e563e5d..0000000
--- a/xt/author/pod-syntax.t
+++ /dev/null
@@ -1,7 +0,0 @@
-#!perl
-# This file was automatically generated by Dist::Zilla::Plugin::PodSyntaxTests.
-use strict; use warnings;
-use Test::More;
-use Test::Pod 1.41;
-
-all_pod_files_ok();
diff --git a/xt/author/portability.t b/xt/author/portability.t
deleted file mode 100644
index f6ac836..0000000
--- a/xt/author/portability.t
+++ /dev/null
@@ -1,10 +0,0 @@
-use strict;
-use warnings;
-
-use Test::More;
-
-eval 'use Test::Portability::Files';
-plan skip_all => 'Test::Portability::Files required for testing portability'
-    if $@;
-options(test_one_dot => 0);
-run_tests();
diff --git a/xt/author/test-version.t b/xt/author/test-version.t
deleted file mode 100644
index 247ba9a..0000000
--- a/xt/author/test-version.t
+++ /dev/null
@@ -1,23 +0,0 @@
-use strict;
-use warnings;
-use Test::More;
-
-# generated by Dist::Zilla::Plugin::Test::Version 1.09
-use Test::Version;
-
-my @imports = qw( version_all_ok );
-
-my $params = {
-    is_strict      => 0,
-    has_version    => 1,
-    multiple       => 0,
-
-};
-
-push @imports, $params
-    if version->parse( $Test::Version::VERSION ) >= version->parse('1.002');
-
-Test::Version->import(@imports);
-
-version_all_ok;
-done_testing;
diff --git a/xt/release/distmeta.t b/xt/release/distmeta.t
deleted file mode 100644
index c2280dc..0000000
--- a/xt/release/distmeta.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!perl
-# This file was automatically generated by Dist::Zilla::Plugin::MetaTests.
-
-use Test::CPAN::Meta;
-
-meta_yaml_ok();