Added more info formats, and fixed a bug in one
Fixed the clumsy handling of %% in format strings.
Merge remote-tracking branch 'origin/develop' into develop