Merge "3D Scene Hit Testing" into devel/master