Now uses the same rules as josef is using in the trunk.
Authored by: keess 2017-08-24
Parent: [r3050]
Child: [r3052]
