release 5.1
Merge branch '5-1-stable' into 'master'

5-1-stable to master

See merge request !78