Merge branch 'master' into oxford

apidoc/conf.py

apidoc/images/x11_slicecanvas_show_bug.png

fsl/__init__.py

fsl/data/featimage.py

fsl/data/melodicresults.py

fsl/data/strings.py

fsl/fsleyes/about.py

fsl/fsleyes/actions/__init__.py

fsl/fsleyes/actions/about.py

fsl/fsleyes/actions/diagnosticreport.py

fsl/fsleyes/colourmaps.py

fsl/fsleyes/controls/atlasoverlaypanel.py

fsl/fsleyes/controls/atlaspanel.py

fsl/fsleyes/controls/clusterpanel.py

fsl/fsleyes/controls/locationpanel.py

fsl/fsleyes/controls/lookuptablepanel.py

fsl/fsleyes/controls/overlaydisplaypanel.py

fsl/fsleyes/controls/overlaylistpanel.py

fsl/fsleyes/controls/plotcontrolpanel.py

fsl/fsleyes/displaycontext/displaycontext.py