Merging last releases back to master #149

Closed ironjan closed 6 years ago