hopefully fixed some dependency salad
Authored by: jbischoff 2015-03-16
Parent: [r32457]
Child: [r32459]