Using `variants` for Python def/class constructs.
Merge branch 'master' of github.com:isagalaev/highlight.js
Normalied ending new-line in AspectJ markup tests.