Merge branch 'master' of https://github.com/josofm/academia.git