Merge branch 'master' of ssh://bitbucket.org/rgrau/lispstrack