update to 1.5.1
Merge in 1.5.1