Merge branch 'master' into 'production'

Master

See merge request !101
2 jobs for production in 1 minute and 53 seconds (queued for 2 seconds)
Name Stage Failure
failed
deploy Deploy
$ echo "$PRIVATEKEY" | tr -d '\r' | ssh-add - > /dev/null
Identity added: (stdin) ((stdin))
$ mkdir -p ~/.ssh
$ chmod 700 ~/.ssh
$ echo "$SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
$ chmod 644 ~/.ssh/known_hosts
$ version=`cat build/android-build/VARIABLES.txt|grep -E '^VERSION=(.*)'|sed -e 's/VERSION=//g'`
cat: build/android-build/VARIABLES.txt: No such file or directory
ERROR: Job failed: exit status 1