Merge branch 'dev/bzr' into next
tree61a29457a264d0c15e3d0e545655f24b847a59c5
drwxr-xr-x - doc
drwxr-xr-x - plugin
drwxr-xr-x - syntax