Merge usptream fixes, libboost 1.7 #176

Closed smartsir796 closed 3 years ago