Fixed tree conflict. ~JJB 20120917 18:29
Authored by: jayjaybillings 2012-09-17
Parent: [r49]
Child: [r51]
