Merge latest from nette/proofreading:master