Lipsum cleanup, about to run maint
Merge remote-tracking branch 'origin/master'