v18.6.1-jh-rc1
e4eae7ae · Merge branch '18-6-revert-duo-to-coderider' into '18-6-stable-jh' ·