Maries's corrections.
Marie's corrections.
Marie's corrections.
Merge branch 'feature/maries_edits' into develop
Merge branch 'release/release1.5'