fix
Merge branch 'add-siaf' of https://github.com/siaf/patchwork into add-siaf

Conflicts:
	contributors/add-siaf.txt