Merged in next-merge-805 (pull request #332)
Empty commit that re-merges master into next in order to make sure 8.0.5 tag is an ancestor of next
8.0.5
next
Empty commit that re-merges master into next in order to make sure
8.0.5
tag is an ancestor ofnext