updating for 0.5.1 release
Merge pull request #5754 from u10int/master

updating for 0.5.1 release