Merge branch 'master' into oxford

fsl/data/featresults.py

fsl/data/image.py

fsl/data/melodicimage.py

fsl/data/melodicresults.py

fsl/data/strings.py

fsl/fsleyes/colourmaps.py

fsl/fsleyes/controls/overlayinfopanel.py

fsl/fsleyes/controls/timeserieslistpanel.py

fsl/fsleyes/overlay.py

fsl/fsleyes/plotting/timeseries.py

fsl/fsleyes/profiles/orthoviewprofile.py

fsl/fsleyes/profiles/profilemap.py

fsl/fsleyes/splash.py

fsl/fsleyes/views/canvaspanel.py

fsl/fsleyes/views/lightboxpanel.py

fsl/fsleyes/views/orthopanel.py

fsl/fsleyes/views/plotpanel.py

fsl/fsleyes/views/timeseriespanel.py

fsl/tools/render.py

fsl/utils/dialog.py