Merge branch 'stamp'
doc sizing fix
download added to the doc viewer
Merge branch 'master' into testing