SAT-929 SAT-945
Merge branch 'master' of github.com:DinshawRaje/satudunia
[resolved issue SAT-926]