Merge branch 'make-it-2017' into 'master'

Update LICENSE year to 2017

See merge request !36
2 jobs for master in 5 minutes and 15 seconds