commit before moving to contrib
Authored by: pieterfourie 2015-04-02
Parent: [r32587]
Child: [r32589]