Merge branch 'issue-204' into 'Current-dev'

Issue 204

See merge request !161
7 jobs for Current-dev in 10 minutes and 25 seconds (queued for 4 seconds)
latest
Status Job ID Name Coverage
  Build
passed #6449
linux32
Linux32-snapshot

00:03:16

passed #6448
linux64
Linux64-snapshot

00:02:26

passed #6452
osx
Osx-dmg-snapshot

00:01:51

passed #6451
osx
Osx-snapshot

00:02:33

passed #6450
raspi
RaspberryPi-snapshot

00:01:32

passed #6447
windows
Win32-snapshot

00:03:45

passed #6446
windows
Win64-snapshot

00:04:12