Merged 1.6.1 changelog entries into 1.7