Push changelog/version changes upstream when releasing
Merge branch '1.6'