Typos and unnecessary includes removed
Authored by: bloehr 2015-12-10
Parent: [r1474]
Child: [r1476]