Started using a Logger (imported Lathanael's). It was about time!
Merge remote-tracking branch 'upstream/master' into painting