html truncaton
Merge branch 'source' into build
Build Mon Mar  4 20:54:41 PST 2013