Revision b0995d750d02d7d4aa5c62f98ec868dd6bb09bb7

Committed on 04/01/2018 4:00 am by Edi Modrić <edi@netgen.hr> [GitHub Diff]

Merge remote-tracking branch 'upstream/2.0'