Merge branch 'hotfix/1.8.2'
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Update 1.8 branch for fix #1565
Merge pull request #1567 from robander/develop

Update 2.0 branch with fix for FILTERFILEURL