Revision af199e7ca0058ab65e5b40fbfa1fdb3132e756ef

Committed on 03/01/2018 7:27 am by Edi Modrić <edi@netgen.hr> [GitHub Diff]

Merge remote-tracking branch 'upstream/2.0'