Merge branch 'master' into timeheap
[ashd.git] / NEWS