Merge branch 'develop' into feature-drill

Conflicts:
	Plugin/KethaneExtractor.cs
	Plugin/Misc.cs