Merge branch 'bb/pedantic'