Clean up SdfParser.cpp
Merge branch 'origin/master'