boofcv : prepare to merge into master