Release5.1

Merge release 5.1 back to master