Merge branch 'master' into mtg-life-points … 

Conflicts:
	src/counter.c
latest commit b923588ff1
@Ps0ke authored