Merge "Fix for text's popup." into devel/master