am 6c767e7d: am 6d25c81e: Merge "Protection against bookmarks with url=null in the database"

Merge commit '6c767e7dc1a6fd9adc5ea8930ad1432a48b74b95'

* commit '6c767e7dc1a6fd9adc5ea8930ad1432a48b74b95':
  Protection against bookmarks with url=null in the database