Merge from softonic/master