merge master into f-droid