Committed patch change by StrPt as patch #10.
Authored by: hpcoder 2014-09-17
Parent: [r1451]
Child: [r1453]
