Once more

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
Merge branch 'master' of https://github.com/coolprop/coolprop

Conflicts:
	dev/buildbot/master/master.cfg