Merge branch 'master' into next

Conflicts:
	testcases/t/173-get-marks.t

diff --cc testcases/t/111-goto.t
Simple merge

diff --cc testcases/t/173-get-marks.t
index 75b6e7a8f0594c34e593cdbb73be277f4053b8c7,007d5a6d507ee1645873900eed41434a97b8fb90..e8964d307b7a8d3a7e57d208558e885d2caebf26
--- 1/testcases/t/173-get-marks.t
--- 2/testcases/t/173-get-marks.t
+++ b/testcases/t/173-get-marks.t
@@@ -33,18 -33,6 +33,6 @@@ is_deeply(get_marks(), [ 'foo' ], 'mar
  
  cmd 'kill';
  
 -cmp_deeply(get_marks(), [ ], 'mark gone');
 +is_deeply(get_marks(), [ ], 'mark gone');
  
- ##############################################################
- # 4: check that duplicate marks are included twice in the get_marks reply
- ##############################################################
- 
- cmd 'open';
- cmd 'mark bar';
- 
- cmd 'open';
- cmd 'mark bar';
- 
- is_deeply(get_marks(), [ 'bar', 'bar' ], 'duplicate mark found twice');
- 
  done_testing;