Merge branch 'master' of https://github.com/andreasschultes/satiptranslator

Signed-off-by: andreasschultes <andreas.schultes@googlemail.com>
Merge branch 'master' of https://github.com/andreasschultes/satiptranslator