2.2 & 4.3 + line indent fix
Merge branch 'master' of https://github.com/andrepeedosaar/Tarkvaratehnika.git