grips moved to contrib + some other changes
Authored by: laemmel 2012-03-14
Parent: [r18727]
Child: [r18729]