what is updated?
Merge branch 'master' of https://github.com/leepedro/imaging

Conflicts:
	src/Imaging/utilities.h