Merge "Fix for selection handles." into devel/master