Merge remote-tracking branch 'origin/2.2-dev' into issue117

Making sure its up to snuff
1 job for issue117 in 1 minute and 24 seconds (queued for 1 second)
Status Name Job ID Coverage
  Test
passed test_Go #1208

00:01:24

25.0%