Synchro updates
Merge remote-tracking branch 'origin/devel' into devel

Conflicts:
	install/templates/rc.conf.local