Merge pull request #2086 from sjinks/1.3.0

Fix #2085
Merge pull request #2087 from sjinks/1.3.0

Fix scope resolution for self:: calls