Merge from jakubgarfield/Bonobo-Git-Server