Merge branch 'master' of http://git.stderr.nl/matthijs/master-project/paper