Merge branch 'maint/release' into 'master'

Prep for 0.6.1 release

See merge request fsl/fsleyes/widgets!19

.ci/build_conda_dist.sh

@@ -6,7 +6,7 @@ name=$1
 version=$2
 
 # add any extra channels that are needed
-for channel in $CONDA_CHANNELS; do
+for channel in $FSL_CONDA_CHANNELS; do
     conda config  --append channels $channel
 done
 

CHANGELOG.rst

@@ -2,6 +2,18 @@ This document contains the ``fsleyes-widgets`` release history in reverse
 chronological order.
 
 
+0.6.1 (Friday May 11th 2018)
+----------------------------
+
+
+Added
+^^^^^
+
+
+* The :func:`.colourBarBitmap` function accepts a new ``scale`` parameter,
+  to allow scaling for high-DPI displays.
+
+
 0.6.0 (Wednesday May 2nd 2018)
 ------------------------------