quick indentation fix on top of latest fix
Merge branch 'master' into performance_optimizations