BRANCH 4.3: fixed reload issue on safari
Merge branch 'remkonoteboom/4.3' of https://github.com/southpawtech/TACTIC-DEV into remkonoteboom/4.3