Merging Master into Falinesti for 1.30 #56

Closed Anurag-Shah closed 4 years ago