Oops! Added BpmControlTest accidentally.
Merge branch 'master' into master_sync

Conflicts:
	src/test/bpmcontrol_test.cpp