Merge remote-tracking branch 'upstream/master' into devel
Merge branch 'devel' of https://github.com/colinmkeith/Dancer into devel