Edited to resolve Native Linux build issues
Authored by: evanvennn 2016-07-14
Parent: [r496]
Child: [r498]
