Henrik Carlqvist and pbatard v2.6.0