PIM-SM: update
Merge branch 'newinet' of https://github.com/kvetak/ANSA.git into newinet