Merge branch 'upgrade-to-gradle-4-6' into 'master'

Update to Gradle 4.6, which now has native support for JUnit5.

See merge request !136
1 job for master in 6 minutes and 31 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #1894
build

00:06:31