Merge branch 'master' into witnessparse
Tara L Andrews [Sun, 15 Apr 2012 21:56:22 +0000 (23:56 +0200)]

Trivial merge