Merge branch 'devel' into issue139
Fixed too-short underlines.
Updated for upstream openjpeg r2354.  #139
Merge branch 'issue139' into devel