Fixed indentation bug
Merge branch 'master' into plugins