1.5.1
Merge branch 'upstream'

Conflicts:
	sixad/Makefile
	sixad/sixad
Fix sixad broken build