Commit on Tue Dec 23 23:33:08 SAST 2014 from root