Imported Upstream version 1.9
Merge commit 'upstream/1.9'
Updated changelog for 1.9