svn -> v48
Merge branch 'master' of github.com:keflavich/despotic
updates from MK