Merge branch 'wrap-blockMatchingImageFilter-types_release' into release

Change-Id: Id6f5675ab661f4fc26dd698efad5158c3f37f555
Merge branch 'release'

Change-Id: I99a6f0e4fbb68bb89f63d372e8456e063de265d4