* More misc commits
nothing is building right now, but I have made a lot of changes and I need to update them to avoid some chaos.
-jtaylor
Authored by: dosadisf 2017-05-24
Parent: [r8]
Child: [r10]
