Added a bit of output so you could tell what was happening.
Merge branch 'master' into graphite2