Should have been in the last commit.
Merge branch 'Kris_ExamplesConf' into develop