Update to upstream version 2.0.6
PR: 232036 Submitted by: riggs Approved by: maintainer timeout MFH: 2018Q4