Merge branch 'debug_display' into 'master'

Patch for the Natvis debugger display for Visual Studio

See merge request !118
Status Job ID Name Coverage
  External
passed jenkins