Merge branch 'Current-dev' into 'master'

0.12.5.0 release

See merge request !136
6 jobs for master in 13 minutes and 58 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #2499
Linux32

00:01:59

passed #2498
Linux64

00:01:46

passed #2501
Osx

00:03:03

passed #2500
RaspberryPi

00:01:36

passed #2497
Win32

00:02:34

passed #2496
Win64

00:02:57