Merge branch 'master' into ENH_plot_external_navigator

Conflicts:
	hyperspy/signal.py