Merging dev branch for 1.5.1.0.