Merge branches 'experimental', 'stable', 'stable' and 'master' of github.com:gosexy/db
Merge branch 'master' into experimental