Merge branch 'patch-1' into 'master'

Update from-scratch.sh pin opencv on version 3

Just to make sure we get opencv 3 always.

See merge request !24