Merge branch '2.0'

Authored by chehrlic on Aug 12 2018, 7:29 PM.

Description

Merge branch '2.0'

Merged Changes

CommitAuthorDetailsCommitted
5182c481a0dbdfaure
Add "override" to all virtual method overrides (mostly scripted) 
Apr 2 2018
f4ec3ee6da0edfaure
Fix compilation with Qt 5.11 (missing include) 
Apr 2 2018