commit db2aaadcf22edc3485deeb91fbb5931e9c53c593 Merge: 589d6f7 2d86ae0 Author: Philipp Winter <phw at nymity.ch> Date: Fri Jun 7 10:38:10 2019 -0700 Merge branch 'master' into develop CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)