merged in develop
Merge branch 'develop' into gitInspector