Merge "Selection box fix for multi-line." into devel/master