Merge remote-tracking branch 'upstream/master'

Conflicts:
	pyFAI-src/blob_detection.py
bring back changes from discared branch