versionadded for remote_tunnel
Merge branch '1.6'