Update Changelog
Merge remote-tracking branch 'upstream/master'

Conflicts:
	docs/CHANGES.rst
Updated CHANGES to reflect width setting fix (r24)
Merge pull request #2 from damilgra/master

Update Changelog