probatis
Merge branch 'github/master'

Conflicts:
	qs.txt
Merge commit '37873ae5ec8c77901d3306e54d07bfea0aee9eaa'