prep for 1.5 release
Merge branch '1.5-branch'
vb master to 1.6dev