version bump, makefile for releasing
Merge branch 'master' into delayed-connect