Merge master into Dev

If someone could fix the changelog conflicts, that'd be great~