Update rules file
Merge remote-tracking branch 'origin/master' into improve_scons_a

Conflicts:
	debian/rules