Merge "Fixes for text's outline." into devel/master