Merge branch 'devel'
Enabled Travis-CI testing of Perl 5.20
Merge branch 'master' into devel