Rollback changes I accidentally made on master branch. These will be added back into master for at next release.
Merge changes
Bump version to 0.11.4
Add a couple unit tests that should take long enough that heartbeats will actually happen.
Tweak amount of sleep in new unit test
Merge branch 'master' into develop
Fix merge conflict
Merge branch 'release/0.11.4' into develop