Merge remote-tracking branch 'upstream/master' into rel/2.3.0

Author: effigies

Changelog

@@ -30,6 +30,7 @@ Upcoming Release
 New features
 ------------
 * TRK <=> TCK streamlines conversion CLI tools (pr/606) (MC, reviewed by CM)
+* Image slicing for SpatialImages (pr/550) (CM)
 
 Enhancements
 ------------

bin/nib-tck2trk

@@ -0,0 +1,18 @@
+#!python
+# emacs: -*- mode: python-mode; py-indent-offset: 4; indent-tabs-mode: nil -*-
+# vi: set ft=python sts=4 ts=4 sw=4 et:
+### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
+#
+#   See COPYING file distributed along with the NiBabel package for the
+#   copyright and license terms.
+#
+### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
+"""
+Convert tractograms (TCK -> TRK).
+"""
+
+from nibabel.cmdline.tck2trk import main
+
+
+if __name__ == '__main__':
+    main()

bin/nib-trk2tck

@@ -0,0 +1,18 @@
+#!python
+# emacs: -*- mode: python-mode; py-indent-offset: 4; indent-tabs-mode: nil -*-
+# vi: set ft=python sts=4 ts=4 sw=4 et:
+### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
+#
+#   See COPYING file distributed along with the NiBabel package for the
+#   copyright and license terms.
+#
+### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ### ##
+"""
+Convert tractograms (TRK -> TCK).
+"""
+
+from nibabel.cmdline.trk2tck import main
+
+
+if __name__ == '__main__':
+    main()