Merge branch 'master' into BUGFIX_estimate_thickness

Conflicts:
	hyperspy/_signals/eels.py
Merge branch 'BUGFIX_estimate_thickness' of https://github.com/francisco-dlp/hyperspy into BUGFIX_estimate_thickness

Conflicts:
	hyperspy/_signals/eels.py
Merge branch 'BUGFIX_estimate_thickness'