Sync from test
Merge remote-tracking branch 'origin/master'

Conflicts:
	rebuild.sh