Example for Sprinkler 1
Merge branch 'master' into patch-1

Conflicts:
	apiary.apib
Update tags for spk1.