Merge remote-tracking branch 'origin/master'

Conflicts:
	qdec_driver/qdec_driver.atsuo