Merge with svn://scm.orgis.org/mpg123/tags/1.15.3 + version up.