Merge pull request #2801 from hathach/release-0.17.0