Threaded annotations
issue #34
Merge remote-tracking branch 'upstream/master' into add_browser_dir_standard