updating this branch w/ 1.5 branch updates