Merge branch 'master' into ptics_time_fixes
"dvacet dvě hodin" -> "dvacet dva hodin" in NLG
Merge branch 'ptics_time_fixes' into navigation_fixes