Merged with ShareX's most recent version