Merge branch 'master' into frequently

CHANGELIST

@@ -1,3 +1,6 @@
+1.4.18 implemented special character handling and support of ZFS resume/receive tokens by default in syncoid,
+       thank you @phreaker0!
+
 1.4.17 changed die to warn when unexpectedly unable to remove a snapshot - this
        allows sanoid to continue taking/removing other snapshots not affected by
        whatever lock prevented the first from being taken or removed

README.md

@@ -109,6 +109,9 @@ syncoid root@remotehost:data/images/vm backup/images/vm
 Which would pull-replicate the filesystem from the remote host to the local system over an SSH tunnel.
 
 Syncoid supports recursive replication (replication of a dataset and all its child datasets) and uses mbuffer buffering, lzop compression, and pv progress bars if the utilities are available on the systems used.
+If ZFS supports resumeable send/receive streams on both the source and target those will be enabled as default.
+
+As of 1.4.18, syncoid also automatically supports and enables resume of interrupted replication when both source and target support this feature.
 
 ##### Syncoid Command Line Options
 
@@ -148,6 +151,10 @@ Syncoid supports recursive replication (replication of a dataset and all its chi
 
 	This argument tells syncoid to restrict itself to existing snapshots, instead of creating a semi-ephemeral syncoid snapshot at execution time. Especially useful in multi-target (A->B, A->C) replication schemes, where you might otherwise accumulate a large number of foreign syncoid snapshots.
 
++ --no-resume
+
+	This argument tells syncoid to not use resumeable zfs send/receive streams.
+
 + --dumpsnaps
 
 	This prints a list of snapshots during the run.

VERSION

@@ -1 +1 @@
-1.4.17
+1.4.18

sanoid

@@ -4,7 +4,7 @@
 # from http://www.gnu.org/licenses/gpl-3.0.html on 2014-11-17.  A copy should also be available in this
 # project's Git repository at https://github.com/jimsalterjrs/sanoid/blob/master/LICENSE.
 
-$::VERSION = '1.4.17';
+$::VERSION = '1.4.18';
 my $MINIMUM_DEFAULTS_VERSION = 2;
 
 use strict;