Merge remote-tracking branch 'gh-takuya-o/patch-mysqli-bookmark-duplicate'

Benjamin Mako Hill || Want to submit a patch?