Merge branch 'master' into 'master'

fsl/data/atlases.py

fsl/data/image.py

fsl/version.py

tests/test_atlases.py

tests/test_image.py

tests/test_version.py

tests/testdata/test_atlases_ho_mask_1mm.nii.gz

tests/testdata/test_atlases_ho_mask_1mm_res1.txt

tests/testdata/test_atlases_ho_mask_1mm_res2.txt

tests/testdata/test_atlases_ho_mask_2mm.nii.gz

tests/testdata/test_atlases_ho_mask_2mm_res1.txt

tests/testdata/test_atlases_ho_mask_2mm_res2.txt

tests/testdata/test_atlases_tal_mask_1mm.nii.gz

tests/testdata/test_atlases_tal_mask_1mm_res1.txt

tests/testdata/test_atlases_tal_mask_1mm_res2.txt

tests/testdata/test_atlases_tal_mask_2mm.nii.gz

tests/testdata/test_atlases_tal_mask_2mm_res1.txt

tests/testdata/test_atlases_tal_mask_2mm_res2.txt