Merge branch 'master' into Current-dev

# Conflicts:
#	src/main.cpp
7 jobs for master in 27 minutes and 13 seconds (queued for 5 seconds)
Status Name Job ID Coverage
  Build
passed Linux32 #7310
linux32

00:04:15

passed Linux64 #7309
linux64

00:04:52

passed Osx #7312
osx

00:03:40

passed Osx-dmg #7313
osx

00:03:52

failed RaspberryPi #7311
raspi

00:00:01

passed Win32 #7308
windows

00:05:30

passed Win64 #7307
windows

00:05:06

 
Name Stage Failure
failed
RaspberryPi Build
Running with gitlab-runner 11.11.4 (e828d3bc)
on raspi2 f99vwHyp
Using Shell executor...
Running on Gitlab-53...
Initialized empty Git repository in /home/gitlab-runner/builds/f99vwHyp/0/crown/crown-core/.git/
Fetching changes...
Created fresh repository.
fatal: unable to access 'https://gitlab-ci-token:[MASKED]@gitlab.crownplatform.com/crown/crown-core.git/': gnutls_handshake() failed: Handshake failed
ERROR: Job failed: exit status 1