Fix for Ubuntu PPA.
Merge branch 'devel'
Updated ChangeLog.