Revision a41bbb0d2a6ed3d0e81544d12d802cf5a2f1360b

Committed on 25/08/2018 8:20 am by Filip Š <filip.stamcar@hotmail.com> [GitHub Diff]

Fix file conflict