Squashed commit of the following: commit 14597103cfe013ce38b6aa9c6eb278c43feac07d Author: Oliver Gorwits <oliver@cpan.org> Date: Tue Aug 6 18:40:18 2013 +0100 ready for 2.012001