Merge commit 'refs/pull/18/head' of github.com:octo/liboping