+ restored heinous removal of tags/ subdirectory (merge -r855:854 root)
Authored by: mukau 2017-06-28
Parent: [r855]
Child: [r857]