Merge branch 'source' into memoryleak
Removed line that was not merged correctly.
Merge branch 'memoryleak' into Referer