Just added some timing debugging stuff.
Merge branch 'master' into groovy