Next release, tag 2.1.3
Merge branch 'master' of http://git.sysphere.org/vicious