firewall and diff
Merge branch 'master' of https://github.com/mabels/construct

Conflicts:
	construct/flavour/ciscian/dialect_dlink-dgs15xx.rb