Updated changelog, cherry-pick fb9704e
Updated changelog, cherry-pick fb9704e

Signed-off-by: Stefan Tatschner <stefan@sevenbyte.org>

Conflicts:
	CHANGES

arabar/pynote,millerdw06/pynote,rumpelsepp/pynote