Merge remote-tracking branch 'giannis/master'

Conflicts:
	papers/Kieffer_Ashiotis/pyFAI.rst
Merge remote-tracking branch 'origin/master'
fixes #issuecomment-60758127