Merge mdv-syntax branch