Fixed error when using tab completion with empty bookmarks file
Merge branch 'master' into issue5