Merge branch 'nanderson-fixcollision' into '2.2-dev'

Fix collision resolution

See merge request !85
4 jobs for 2.2-dev in 1 minute and 38 seconds
Status Job ID Name Coverage
  Test
passed #2458
Go-py2.7

00:01:36

passed #2459
Go-py3.4

00:01:38

passed #2460
Go-py3.5

00:01:37

passed #2461
Go-py3.6

00:01:38

72.0%