Commit 0edd8143 authored by Ivaria's avatar Ivaria

Merge branch 'shadowlands' into 'master'

Shadowlands pre-patch

See merge request !8
parents e1855909 9e7e4dfe