Commit before porting to 0.9.0 and enet