Reference self instead of this
Merge branch 'watchdog' into blackboard
Bump version