Patch aug. 20., Merge from github because trac is down