Merge "Fix setting a void string to the TEXT property." into devel/master