Update to latest stable release (1.5.1)
Merge branch 'update_1.5'