Latest commit 0cfe4f7 Feb 16, 2015 @TheTimeLord TheTimeLord conflict fix