integrity/integrity — pull request #210 by p (2013-01-30 02:17:36+00:00)
Title: Integrity branch tests + fix

This fixes #206 which was broken on master.

@grahamc please check if this patch breaks anything for you.