Merge "Fixed an incorrect ellipsis" into devel/master