make inspector work with modal dialogs
Merge remote-tracking branch 'origin/master'