NejcZdovc merged 1 commit into master from 10254 Aug 3, 2017