Manual merge of cf5dd13f83
cf5dd13f83
From: https://github.com/c172p-team/c172p-detailed/releases/tag/version%2F2018.2 f772964361
f772964361