exclude-bugs needed for 'mvn site'
Merge branch 'mark' into dev