Merge local development branch
[milk] / NEWS