Merge branch 'master' of git@wien.tomnetworks.com:hwmod