Commit on Fri Dec 26 23:36:45 SAST 2014 from root