Merge pull request #2916 from walterlife/walterlife/1.8.0-patch-1

Prepare for 1.8.0 release