Non-conflicting merge
Merge pull request #21 from wolfe/a

aio-monitor: auto-merge