Minor updates from the formats branch#492

margaretha merged 11 commits into

mainclarin-eric/standards:mainfrom

formatsclarin-eric/standards:formatsCopy head branch name to clipboard