Merge branch '3.6.1-dev' into 'master'

3.6.1 dev

Closes #2

See merge request !4
1 job for 4.3.1-dev in 0 seconds (queued for 1 minute and 21 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:41