Merge remote-tracking branch 'origin/5.1'

Authored by kfunk on Mar 27 2017, 8:18 AM.

Description

Merge remote-tracking branch 'origin/5.1'

Merged Changes

CommitAuthorDetailsCommitted
aa1baf6583cfkossebau
Fix include path for export header to also work when installed 
Mar 24 2017
856b2e89ef14kossebau
Fix some include paths for export headers to also work when installed 
Mar 24 2017
5c681b15930fD5155kossebau
Load Template From File dialogs: fix wrong filter strings usage 
Mar 23 2017