Merge topic 'FixImplicitConversionWarnings'

7aef8efd COMP: fix itk types for conversion
Merge branch 'master' into next

Change-Id: I158e74cb9f4c3ac1e2f26ef7c35ad1748b1db174