1.2 -> 1.0
Merge origin/master

Conflicts:
	wave.c