Several patches here and pull requests at the upstream github project
page were merged into the devel branch.  Switch to that until the next
stable release.

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>