Fix changelog and version after merge with public master

3 jobs for 2017.03 in 3 minutes and 54 seconds (queued for 2 seconds)
latest