atdtool 1.3
Merge branch 'devel'
Rebuilt after merge.