Merged changelog with trunk's.