Merge branch 'ppa'
Merge branch 'devel'
Updated ChangeLog date.
Merge branch 'master' into devel