fix to 2.2
Merge branch 'master' of https://github.com/Fredrik89/mt

* 'master' of https://github.com/Fredrik89/mt:
  justifications