1. 49f1b57 solution: merging various changes by atraczyk ยท 8 years ago