better display:block support
Merge branch 'master' into beta