First update after forking davdroid