Merge branch 'indentations' into 'master'

Updated suggested emacs indendation configuration

See merge request !776
3 jobs for master in 27 minutes and 26 seconds (queued for 2 seconds)