Better nothumb.png
Some simple debugging.
Merged SVN r510.
Merged SVN r511 and r512.