Merge master into next

Change-Id: I664f964827e8ab0bad4517dd91e1645d085ce81c
Merge topic 'fix_multiblock_inspector_issues' into next

5bf602d Display Panel wasn't clearing after disconnect.
b9b479b Overcome STL assertions with Debug Visual Studio builds.