work in progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	papers/Kieffer_Ashiotis/pyFAI.rst