Hopefully fixed http://pastie.org/5663358
Merge branch 'master' into chunkTests